You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		1 year ago
..
exports	Settings controllers specs (#23915)	2 years ago
migration	Refactor `Cache-Control` and `Vary` definitions (#24347)	2 years ago
preferences	Spec coverage for settings/preferences/* controllers (#24825)	2 years ago
two_factor_authentication	Fix `Lint/AmbiguousBlockAssociation` cop (#25921)	1 year ago
aliases_controller_spec.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2 years ago
applications_controller_spec.rb	Fix RSpec/ExpectInHook cop (#25100)	1 year ago
deletes_controller_spec.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2 years ago
exports_controller_spec.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2 years ago
featured_tags_controller_spec.rb	Spec coverage on Settings/ controllers specs (#24221)	2 years ago
flavours_controller_spec.rb	Fix most rubocop issues (#2165)	2 years ago
imports_controller_spec.rb	Fix RSpec/InferredSpecType cop (#24736)	2 years ago
login_activities_controller_spec.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2 years ago
migrations_controller_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
pictures_controller_spec.rb	Spec coverage on Settings/ controllers specs (#24221)	2 years ago
profiles_controller_spec.rb	Fix RSpec/InferredSpecType cop (#24736)	2 years ago
sessions_controller_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
two_factor_authentication_methods_controller_spec.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2 years ago