Claire 29124990a2 Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream reworked how CSS classes for the document's body are computed.
  Slight conflict due to glitch-soc's different theming system.
  Updated as upstream did.

2024-09-06 19:25:31 +02:00

..

activitypub

Remove body_as_json in favor of built-in response.parsed_body for JSON response specs (#31749)

2024-09-06 09:58:46 +00:00

admin

Fix sort order of moderation notes on Reports and Accounts (#31528)

2024-09-06 14:58:36 +00:00

api

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

auth

Remove body_as_json in favor of built-in response.parsed_body for JSON response specs (#31749)

2024-09-06 09:58:46 +00:00

concerns

Add have_http_link_header matcher and set header values as strings (#31010)

2024-09-05 20:05:38 +00:00

disputes

Rename jobs/attachments rspec tag names (#29762)

2024-07-08 16:01:08 +00:00

filters

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

oauth

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

settings

Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream

2024-09-04 19:38:52 +02:00

.rubocop.yml

Use unchanging github links in docs/comments (#29545)

2024-03-11 15:14:55 +00:00

application_controller_spec.rb

Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream

2024-09-04 19:38:52 +02:00

authorize_interactions_controller_spec.rb

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

filters_controller_spec.rb

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

follower_accounts_controller_spec.rb

Remove body_as_json in favor of built-in response.parsed_body for JSON response specs (#31749)

2024-09-06 09:58:46 +00:00

following_accounts_controller_spec.rb

Remove body_as_json in favor of built-in response.parsed_body for JSON response specs (#31749)

2024-09-06 09:58:46 +00:00

intents_controller_spec.rb

Fix RSpec/InferredSpecType cop (#24736)

2023-05-04 05:49:53 +02:00

relationships_controller_spec.rb

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

statuses_cleanup_controller_spec.rb

Fix RSpec/InstanceVariable cop (#27766)

2023-11-08 15:42:30 +00:00

statuses_controller_spec.rb

Remove body_as_json in favor of built-in response.parsed_body for JSON response specs (#31749)

2024-09-06 09:58:46 +00:00