nyastodon/spec
Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.
2023-02-25 14:00:40 +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-02-25 14:00:40 +01:00
fabricators Autofix Rubocop Rails/RootPathnameMethods (#23760) 2023-02-22 09:57:15 +09: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 Fix mispelled spec filenames (#23834) 2023-02-23 11:28:56 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
mailers Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
models Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +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 Rename ActivityPub Serializer Specs (#23844) 2023-02-23 23:17:48 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
support Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
views/statuses Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
workers Change auto-deletion throttling constants to better scale with server size (#23320) 2023-02-23 16:52:40 +01:00
rails_helper.rb Autofix Rubocop Rails/RootPathnameMethods (#23760) 2023-02-22 09:57:15 +09:00
spec_helper.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00