Claire fef055db96 Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream ... Conflicts: - `spec/requests/api/v1/timelines/tag_spec.rb`: Upstream refactored this file, while we had a change to switch a default setting. Updated as upstream did. - `spec/views/statuses/show.html.haml_spec.rb`: Upstream refactored this file, while we stubbed different methods. Updated as upstream did, and updated the stubs accordingly.		2024-09-03 21:51:53 +02:00
..
migration	…
preferences	Adapt settings spec to glitch-soc	2024-06-11 19:54:27 +02:00
two_factor_authentication	Remove usage of `assigns` in controller specs (#30195)	2024-09-03 15:23:16 +00:00
aliases_controller_spec.rb	…
applications_controller_spec.rb	Merge pull request from GHSA-vp5r-5pgw-jwqx	2024-07-04 16:11:28 +02:00
deletes_controller_spec.rb	Rename jobs/attachments rspec tag names (#29762)	2024-07-08 16:01:08 +00:00
exports_controller_spec.rb	Use Sidekiq `fake!` instead of `inline!` in specs (#25369)	2024-01-10 11:06:58 +00:00
featured_tags_controller_spec.rb	Clean up `settings/featured_tags/index` view (#28688)	2024-01-11 10:45:26 +00:00
flavours_controller_spec.rb	…
imports_controller_spec.rb	Remove usage of `assigns` in controller specs (#30195)	2024-09-03 15:23:16 +00:00
login_activities_controller_spec.rb	Refactor login activity partial (remove inline ruby) (#28687)	2024-01-11 10:36:27 +00:00
migrations_controller_spec.rb	…
pictures_controller_spec.rb	…
privacy_controller_spec.rb	…
profiles_controller_spec.rb	…
sessions_controller_spec.rb	…
two_factor_authentication_methods_controller_spec.rb	…
verifications_controller_spec.rb	…