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 83dc54c487 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.		5 years ago
..
challenges_controller.rb	glitch-soc theme engine fixes for the challenges controller	5 years ago
confirmations_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
omniauth_callbacks_controller.rb	Change unconfirmed user login behaviour (#11375)	5 years ago
passwords_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
registrations_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
sessions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
setup_controller.rb	Fix new user confirmation page styling	5 years ago