mastodon/spec
Claire 3ef5f62abf Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream switched to pushing to both DockerHub and GitHub Container
  Repository, while glitch-soc was already pushing to the latter only.
  Updated our configuration to be slightly more consistent with upstream's
  naming and styling, but kept our behavior.
- `Gemfile.lock`:
  Updated dependencies textually too close to glitch-soc only hcaptcha
  dependency.
  Updated dependencies as upstream did.
- `README.md`:
  Upstream updated its README, but we have a completely different one.
  Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
  Minor style fix upstream that's on a line glitch-soc removed because
  of its different theming system.
  Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
  This file apparently did not exist upstream, upstream created it with
  different contents but it is functionally the same.
  Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
  had its own code because it's a fork and does not have the same default
  source URL.
  Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
  Upstream dependencies textually too close to a glitch-soc only one.
  Updated dependencies as upstream did.
2023-03-15 09:16:10 +01: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-15 09:16:10 +01: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-15 09:16:10 +01: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-15 09:16:10 +01: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-15 09:16:10 +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-02 17:32:38 +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-03-05 20:46:56 +01:00
views/statuses Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
workers Coverage improvement round-out following up previous work (#23987) 2023-03-10 13:33:30 +01: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