Thibaut Girka 12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.		2020-06-09 10:39:20 +02:00
..
exports
migration	Fix account redirect confirmation message talking about moved followers (#13950)	2020-06-03 20:18:19 +02:00
preferences
two_factor_authentication
aliases_controller.rb
applications_controller.rb
base_controller.rb
deletes_controller.rb
exports_controller.rb
featured_tags_controller.rb
flavours_controller.rb
identity_proofs_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-10 16:19:56 +02:00
imports_controller.rb
migrations_controller.rb	Fix account migration not affecting followers on origin server (#11980)	2019-09-29 16:23:13 +02:00
pictures_controller.rb	Allow users to delete their header and avatar (#13234)	2020-04-20 14:03:03 +02:00
preferences_controller.rb
profiles_controller.rb
sessions_controller.rb
two_factor_authentications_controller.rb