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 4a70792b4a Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well.		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)	6 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