Claire 9ae60f8738 Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream ... Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.		2023-07-12 16:03:05 +02:00
..
exports	…
migration	Refactor `Cache-Control` and `Vary` definitions (#24347)	2023-04-19 16:07:29 +02:00
preferences	Spec coverage for settings/preferences/* controllers (#24825)	2023-05-04 05:44:27 +02:00
two_factor_authentication	Fix `Lint/AmbiguousBlockAssociation` cop (#25921)	2023-07-12 10:02:41 +02:00
aliases_controller_spec.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2023-04-19 16:07:29 +02:00
applications_controller_spec.rb	Fix RSpec/ExpectInHook cop (#25100)	2023-05-23 16:40:21 +02:00
deletes_controller_spec.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2023-04-19 16:07:29 +02:00
exports_controller_spec.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2023-04-19 16:07:29 +02:00
featured_tags_controller_spec.rb	…
flavours_controller_spec.rb	…
imports_controller_spec.rb	Fix RSpec/InferredSpecType cop (#24736)	2023-05-04 05:49:53 +02:00
login_activities_controller_spec.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2023-04-19 16:07:29 +02:00
migrations_controller_spec.rb	…
pictures_controller_spec.rb	…
profiles_controller_spec.rb	Fix RSpec/InferredSpecType cop (#24736)	2023-05-04 05:49:53 +02:00
sessions_controller_spec.rb	…
two_factor_authentication_methods_controller_spec.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2023-04-19 16:07:29 +02:00