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.		2020-05-10 16:19:56 +02:00
..
exports	Export and import show_reblogs together with following list (#10495)	2019-04-08 07:28:27 +02:00
preferences	Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)	2019-06-07 16:51:08 +02:00
two_factor_authentication	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00
applications_controller_spec.rb
deletes_controller_spec.rb	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00
exports_controller_spec.rb
featured_tags_controller_spec.rb	Fixes featured hashtag setting page erroring out instead of rejecting invalid tags (#12436)	2019-12-17 13:31:56 +01:00
flavours_controller_spec.rb
identity_proofs_controller_spec.rb	Add ability to remove identity proofs from account (#13682)	2020-05-10 11:21:10 +02:00
imports_controller_spec.rb
migrations_controller_spec.rb	Add account migration UI (#11846)	2019-09-19 20:58:19 +02:00
profiles_controller_spec.rb
sessions_controller_spec.rb
two_factor_authentications_controller_spec.rb	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00