Claire 30ee7339d3 Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: Upstream changed code style change, including on a line modified by glitch-soc. Kept glitch-soc's line but with the code style change applied.		2023-12-21 19:31:12 +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 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream	2023-12-21 19:24:10 +01:00
fabrication	Restore console behavior in test env (#26401)	2023-08-09 11:26:56 +02:00
fabricators	Add spec coverage for models/form/custom_emoji_batch class (#28388)	2023-12-18 12:41:37 +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 '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream	2023-12-20 22:16:50 +01:00
lib	Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream	2023-12-21 19:24:10 +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 '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream	2023-12-21 19:31:12 +01:00
policies	Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream	2023-09-15 20:57:40 +02:00
presenters	Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream	2023-12-21 19:31:12 +01:00
requests	Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream	2023-12-21 19:31:12 +01:00
routing	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
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	Unwind map on single-item array in spec/services/delete_account_service spec (#28358)	2023-12-14 14:07:54 +00:00
support	Formalize some patterns in cli specs (#28255)	2023-12-07 13:49:14 +00:00
system	Fixes website not loading for unlogged users (#27698)	2023-11-04 21:52:56 +00:00
validators	Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' 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	Remove the stub_stdout wrapper around CLI specs (#28340)	2023-12-13 10:14:19 +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