Claire dfe851b476 Merge branch 'stable-4.3' into glitch-soc/backports-4.3 ... Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper.		2024-10-05 20:45:05 +02:00
..
activitypub	Remove `page_json` var from ap/replies spec (#32000)	2024-09-26 08:54:01 +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	Move OTP secret length to configuration (#32125)	2024-10-04 17:48:03 +02: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	Reduce factory creation (36 -> 12) in `spec/controllers/oauth/*` area (#32045)	2024-09-25 07:56:08 +00:00
settings	Merge branch 'stable-4.3' into glitch-soc/backports-4.3	2024-10-05 20:45:05 +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 unneeded `to_s` on `Link` header comparison in statuses controller spec (#31941)	2024-09-18 08:21:31 +00:00