masto-fe/spec
Claire 01d6f7529f Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream added a link to the roadmap, but we have a completely different README.
  Kept ours.
- `app/models/media_attachment.rb`:
  Upstream upped media attachment limits.
  Updated the default according to upstream's.
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream changed the migration compatibility level.
  Did so too.
- `config/initializers/content_security_policy.rb`:
  Upstream refactored this file but we have a different version.
  Kept our version.
- `app/controllers/settings/preferences_controller.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  The file does not directly references individual settings anymore.
  Applied upstream changes.
- `app/lib/user_settings_decorator.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  The file got removed entirely.
  Removed it as well.
- `app/models/user.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  References to individual settings have been removed from the file.
  Removed them as well.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `config/settings.yml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  In particular, upstream removed user-specific and unused settings.
  Did the same in glitch-soc.
- `spec/controllers/application_controller_spec.rb`:
  Conflicts due to glitch-soc's theming system.
  Mostly kept our version, as upstream messed up the tests.
2023-03-31 21:30:27 +02:00
..
chewy Add basic search specs for chewy indexes (#24065) 2023-03-10 19:31:10 +01:00
config/initializers Fix rack:attack flaky tests and test end of throttle period (#23799) 2023-02-22 10:28:52 +01:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2023-03-31 21:30:27 +02:00
fabricators Serializers spec coverage (#24017) 2023-03-10 12:12:51 +01:00
features Autofix Rubocop RSpec/ImplicitSubject (#23721) 2023-02-20 05:00:48 +01:00
fixtures Change domain block CSV parsing to be more robust and handle more lists (#21470) 2023-01-18 16:20:52 +01:00
helpers Coverage improvement round-out following up previous work (#23987) 2023-03-10 13:33:30 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2023-03-31 21:30:27 +02:00
mailers User mailer spec coverage improvements (#23905) 2023-03-04 17:16:11 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2023-03-31 21:30:27 +02:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2023-03-16 23:12:59 +01:00
requests Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
routing Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
serializers Serializers spec coverage (#24017) 2023-03-10 12:12:51 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2023-03-31 21:30:27 +02:00
support Autofix Rubocop Style/PreferredHashMethods (#23851) 2023-03-16 01:36:37 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
views/statuses Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
workers Requeue expiration notification (#24311) 2023-03-29 10:52:40 +02:00
fabricators_spec.rb Fabricator specs (#23925) 2023-03-04 17:12:09 +01:00
rails_helper.rb Add basic search specs for chewy indexes (#24065) 2023-03-10 19:31:10 +01:00
spec_helper.rb Add policies and serializers groups to simplecov output (#23897) 2023-02-27 16:35:47 +01:00