You can not 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 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.		4 years ago
..
chewy	…
controllers	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
helpers	…
javascript	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
lib	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
mailers	…
models	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
policies	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
presenters	…
serializers	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
services	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
validators	…
views	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
workers	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago