monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/spec/controllers/settings
History
Claire 25a46d9e59 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/fonts/montserrat.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/models/account.rb`:
  Textual conflict only caused by glitch-soc using a different value
  for character limits in a nearby line.
  Applied upstream's changes.
- `app/views/statuses/_simple_status.html.haml`:
  Attribute added to a tag modified by glitch-soc.
  Added upstream's attributes.
- `yarn.lock`:
  Upstream added/updated dependencies close to glitch-soc-only ones.
  Updated/added upstream dependencies.
 		2022-06-02 09:49:38 +02:00
..
exports Fix test-related issues (#17888) 2022-03-28 12:43:58 +02:00
preferences Remove unused `filtered_languages` column (#18533) 2022-05-27 20:05:22 +02:00
two_factor_authentication Fix typo in source `setted`->`set` (#18385) 2022-05-10 04:58:04 +02:00
applications_controller_spec.rb lint pass 2 (#8878) 2018-10-04 17:38:04 +02:00
deletes_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01: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
…
imports_controller_spec.rb Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
migrations_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
profiles_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
sessions_controller_spec.rb
…
two_factor_authentication_methods_controller_spec.rb Add WebAuthn as an alternative 2FA method (#14466) 2020-08-24 16:46:27 +02:00