Claire 077e0c6812 Merge commit '0b4a3a0437' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system.		2023-12-20 22:16:50 +01:00
..
chewy	Add new public status index (#26344)	2023-08-24 16:40:04 +02:00
config/initializers/rack	Fix RSpec/SpecFilePathFormat cops (#27730)	2023-11-06 16:25:40 +00:00
controllers	Merge commit '0b4a3a0437' into glitch-soc/merge-upstream	2023-12-20 22:16:50 +01:00
fabrication	Restore console behavior in test env (#26401)	2023-08-09 11:26:56 +02:00
fabricators	Remove default_scope from Admin::ActionLog (#28026)	2023-11-29 10:39:59 +00:00
features	Stub controller methods and remove rubocop:disable in captcha feature spec (#27743)	2023-11-07 09:15:30 +00:00
fixtures	Add spec coverage for CLI::Emoji class (#28182)	2023-12-06 08:52:30 +00:00
generators	Fix flaky tests related to file creation (#28248)	2023-12-06 22:22:25 +00:00
helpers	Merge commit '0b4a3a0437' into glitch-soc/merge-upstream	2023-12-20 22:16:50 +01:00
lib	Merge commit '0b4a3a0437' into glitch-soc/merge-upstream	2023-12-20 22:16:50 +01:00
locales	Replace i18n view spec with helper spec (#24966)	2023-05-15 17:25:04 +02:00
mailers	Add missing email previews for AdminMailer (#28044)	2023-11-23 12:32:50 +00:00
models	Merge commit '0b4a3a0437' into glitch-soc/merge-upstream	2023-12-20 22:16:50 +01:00
policies	Merge commit '398635c0c4' into glitch-soc/merge-upstream	2023-09-15 20:57:40 +02:00
presenters	Merge commit '1526e54ac6' into glitch-soc/merge-upstream	2023-12-19 20:24:57 +01:00
requests	Merge commit '0b4a3a0437' into glitch-soc/merge-upstream	2023-12-20 22:16:50 +01:00
routing
search/models/concerns/account	Model concerns organization into module namespaces (#28149)	2023-12-01 11:00:41 +00:00
serializers	Add VAPID public key to instance serializer (#28006)	2023-11-29 08:34:36 +00:00
services	Remove double subject call in services/delete_account_service spec (#28212)	2023-12-06 08:51:09 +00:00
support	Fix Style/SuperWithArgsParentheses cop (#28174)	2023-12-01 15:53:15 +00:00
system	Fixes website not loading for unlogged users (#27698)	2023-11-04 21:52:56 +00:00
validators	Merge commit 'b87bfb8c96' into glitch-soc/merge-upstream	2023-12-18 18:34:25 +01:00
views	Fix RSpec/MetadataStyle cop in spec/ (#27729)	2023-11-06 14:28:20 +00:00
workers	Consolidate configuration of Sidekiq::Testing.fake! setup (#28046)	2023-11-23 09:43:43 +00:00
rails_helper.rb	Consolidate configuration of Sidekiq::Testing.fake! setup (#28046)	2023-11-23 09:43:43 +00:00
spec_helper.rb	Disable simplecov enable_coverage_for_eval option, move to standalone file (#27869)	2023-11-15 23:09:31 +00:00