Claire 5a55180b95 Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream ... Conflicts: - `spec/lib/sanitize/config_spec.rb`: Upstream rewrote top-level `describe` calls to `RSpec.describe`, and glitch-soc had differences in the first few tests because of the wider subset of HTML it accepts. Changed `describe` to `RSpec.describe` as upstream did, keeping glitch-soc's tests.		2024-09-04 19:38:52 +02:00
..
activitypub	Enable "zero monkey patching" mode in RSpec (#31614)	2024-09-04 05:12:25 +00:00
admin	Enable "zero monkey patching" mode in RSpec (#31614)	2024-09-04 05:12:25 +00:00
api	Enable "zero monkey patching" mode in RSpec (#31614)	2024-09-04 05:12:25 +00:00
auth	Enable "zero monkey patching" mode in RSpec (#31614)	2024-09-04 05:12:25 +00:00
concerns	Enable "zero monkey patching" mode in RSpec (#31614)	2024-09-04 05:12:25 +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	Enable "zero monkey patching" mode in RSpec (#31614)	2024-09-04 05:12:25 +00:00
following_accounts_controller_spec.rb	Enable "zero monkey patching" mode in RSpec (#31614)	2024-09-04 05:12:25 +00:00
intents_controller_spec.rb	Fix RSpec/InferredSpecType cop (#24736)	2023-05-04 05:49:53 +02:00
invites_controller_spec.rb	Enable "zero monkey patching" mode in RSpec (#31614)	2024-09-04 05:12:25 +00: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	Enable "zero monkey patching" mode in RSpec (#31614)	2024-09-04 05:12:25 +00:00