This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/spec/controllers/settings
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 lint pass 2 (#8878) 2018-10-04 17:38:04 +02:00
deletes_controller_spec.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00
exports_controller_spec.rb Add spec for Settings::ExportsController#create (#9512) 2018-12-13 02:53:52 +01:00
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 Thank you, Officer Murphy 2018-01-10 12:10:43 -06:00
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 Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
migrations_controller_spec.rb Add account migration UI (#11846) 2019-09-19 20:58:19 +02:00
profiles_controller_spec.rb Error message for avatar image that's too large. #9204 (#9518) 2018-12-14 05:07:21 +01:00
sessions_controller_spec.rb Add missing tests for sessions controller (#7744) 2018-06-06 10:23:22 +09:00
two_factor_authentications_controller_spec.rb Add password challenge to 2FA settings, e-mail notifications (#11878) 2019-09-18 16:37:27 +02:00