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
..
exports	…
preferences	Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)	6 years ago
two_factor_authentication	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago
applications_controller_spec.rb	…
deletes_controller_spec.rb	Change unconfirmed user login behaviour (#11375)	5 years ago
exports_controller_spec.rb	…
featured_tags_controller_spec.rb	Fixes featured hashtag setting page erroring out instead of rejecting invalid tags (#12436)	5 years ago
flavours_controller_spec.rb	…
identity_proofs_controller_spec.rb	Add ability to remove identity proofs from account (#13682)	5 years ago
imports_controller_spec.rb	…
migrations_controller_spec.rb	Add account migration UI (#11846)	5 years ago
profiles_controller_spec.rb	…
sessions_controller_spec.rb	…
two_factor_authentications_controller_spec.rb	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago