Thibaut Girka a7aedebc31 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file.		2020-09-28 14:13:30 +02:00
..
environments	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-15 15:32:40 +02:00
initializers	Merge branch 'master' into glitch-soc/merge-upstream	2020-08-30 16:13:08 +02:00
locales	Change account suspensions to be reversible by default (#14726)	2020-09-15 14:37:58 +02:00
locales-glitch
webpack	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-01 17:02:18 +02:00
application.rb	Add color extraction for audio thumbnails (#14209)	2020-07-05 18:28:25 +02:00
boot.rb
brakeman.ignore
database.yml
deploy.rb
environment.rb
i18n-tasks.yml
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-28 14:13:30 +02:00
pghero.yml
puma.rb
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-28 14:13:30 +02:00
secrets.yml
settings.yml
sidekiq.yml
webpacker.yml