You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, we deleted it to not be flooded by Depandabot. Kept deleted. - `Gemfile.lock`: Puma updated on both sides, went for the most recent version. - `app/controllers/api/v1/mutes_controller.rb`: Upstream updated the serializer to support timed mutes, while glitch-soc added a custom API ages ago to get information that is already available elsewhere. Dropped the glitch-soc-specific API, went with upstream changes. - `app/javascript/core/admin.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/javascript/packs/public.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/models/mute.rb`: 🤷 - `app/models/user.rb`: New user setting added upstream while we have glitch-soc-specific user settings. Added upstream's user setting. - `config/settings.yml`: Upstream added a new user setting close to a user setting we had changed the defaults for. Added the new upstream setting. - `package.json`: Upstream dependency updated “too close” to a glitch-soc-specific dependency. No real conflict. Updated the dependency.		5 years ago
..
assets	Add emoji autosuggest (#5053)	8 years ago
chewy/strategy	Fix records not being indexed sometimes (#12024)	6 years ago
devise	Fix authentication before 2FA challenge (#11943)	6 years ago
generators	Add post-deployment migration system (#8182)	7 years ago
json_ld	Fix preloaded JSON-LD context for identity not being used (#12138)	6 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
paperclip	Fix downloading remote media files when server returns empty filename (#14867)	5 years ago
redis	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	5 years ago
tasks	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
templates	Add post-deployment migration system (#8182)	7 years ago
cli.rb	Add IP-based rules (#14963)	5 years ago