Claire ab2f0daa10 Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-security.yml`: Changes were already cherry-picked and adapted in glitch-soc. Kept glitch-soc's version. - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `lib/mastodon/version.rb`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version.		2024-02-24 14:27:43 +01:00
..
activitypub	Reduce request/response round-trips in ap/collections controller spec (#29102)	2024-02-06 13:10:00 +00:00
admin	Add missing action logging to `api/v1/admin/reports#update` (#29044)	2024-02-06 11:34:11 +00:00
api	Merge commit '1467f1e1e1c18dc4b310862ff1f719165a24cfb6' into glitch-soc/merge-upstream	2024-02-24 14:15:49 +01:00
auth	Add notification email on invalid second authenticator (#28822)	2024-01-22 13:55:43 +00:00
concerns	Combine repeated requests in account controller concern spec (#28957)	2024-01-30 15:32:20 +00:00
disputes	Add coverage/bugfix for invalid appeal submission (#28703)	2024-01-12 09:21:00 +00:00
filters	Refactor `Cache-Control` and `Vary` definitions (#24347)	2023-04-19 16:07:29 +02:00
oauth	Clean up of `RSpec/LetSetup` within `spec/controllers` (#28446)	2023-12-21 09:28:41 +00:00
settings	Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream	2024-01-11 20:15:19 +01:00
.rubocop.yml	Fix `RSpec/DescribedClass` cop (#25104)	2023-06-06 13:58:33 +02:00
about_controller_spec.rb	Fix RSpec/InferredSpecType cop (#24736)	2023-05-04 05:49:53 +02:00
application_controller_spec.rb	Merge commit '87ad398ddc78f2da5746774960690661e8e57335' into glitch-soc/merge-upstream	2024-02-24 14:02:01 +01:00
authorize_interactions_controller_spec.rb	Change interaction modal in web UI (#26075)	2023-07-27 16:11:17 +02:00
custom_css_controller_spec.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2023-04-19 16:07:29 +02:00
emojis_controller_spec.rb	Improve spec coverage for `models/announcement` class (#28350)	2023-12-14 10:29:10 +00:00
filters_controller_spec.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2023-04-19 16:07:29 +02:00
follower_accounts_controller_spec.rb	Clean up of `RSpec/LetSetup` within `spec/controllers` (#28446)	2023-12-21 09:28:41 +00:00
following_accounts_controller_spec.rb	Clean up of `RSpec/LetSetup` within `spec/controllers` (#28446)	2023-12-21 09:28:41 +00:00
health_controller_spec.rb	Coverage improvement round-out following up previous work (#23987)	2023-03-10 13:33:30 +01:00
home_controller_spec.rb	Use framework helpers instead of i-vars in controller specs (#27767)	2023-11-08 08:17:43 +00:00
instance_actors_controller_spec.rb	Combine double subjects in instance actors controller shared example (#28939)	2024-01-26 16:28:50 +00:00
intents_controller_spec.rb	Fix RSpec/InferredSpecType cop (#24736)	2023-05-04 05:49:53 +02:00
invites_controller_spec.rb	Fix RSpec/ExpectChange cop (#25101)	2023-05-24 11:23:40 +02:00
manifests_controller_spec.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2023-04-19 16:07:29 +02:00
media_controller_spec.rb	…
media_proxy_controller_spec.rb	…
privacy_controller_spec.rb	Coverage improvement round-out following up previous work (#23987)	2023-03-10 13:33:30 +01:00
relationships_controller_spec.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2023-04-19 16:07:29 +02:00
shares_controller_spec.rb	Remove instance variables from helper usage (#24203)	2023-04-23 22:35:54 +02:00
statuses_cleanup_controller_spec.rb	Fix `RSpec/InstanceVariable` cop (#27766)	2023-11-08 15:42:30 +00:00
statuses_controller_spec.rb	Reduce expectations for `RSpec/MultipleExpectations` cop in `controllers/statuses` spec (#27875)	2023-11-16 09:54:51 +00:00
tags_controller_spec.rb	Fix RSpec/InferredSpecType cop (#24736)	2023-05-04 05:49:53 +02:00