Claire 63acdebc5d Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because of a code style fix, while some changed lines are absent from glitch-soc. Ignored the deleted lines.		2024-01-11 13:17:13 +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 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream	2024-01-10 17:51:12 +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	Fix Capybara/ClickLinkOrButtonStyle cop in spec/features (#28576)	2024-01-04 09:20:32 +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 branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00
lib	Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream	2024-01-11 13:17:13 +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 '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream	2024-01-11 12:59:27 +01:00
policies	Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream	2023-09-15 20:57:40 +02:00
presenters	Merge branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00
requests	Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream	2024-01-03 12:38:49 +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	Misc coverage improvements re: sidekiq/inline (#28651)	2024-01-09 09:40:08 +00:00
support	Fix Capybara/ClickLinkOrButtonStyle cop in spec/features (#28576)	2024-01-04 09:20:32 +00:00
system	Add a system spec for the /share endpoint (#28672)	2024-01-09 21:58:19 +00:00
validators	Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream	2024-01-10 17:51:12 +01:00
views	Fix RSpec/MetadataStyle cop in spec/ (#27729)	2023-11-06 14:28:20 +00:00
workers	Fix RSpec/LetSetup cop in spec/services (#28459)	2023-12-21 14:23:53 +00:00
rails_helper.rb	Fix NULL MX handling and tighten DNS resolving specs (#28607)	2024-01-05 11:07:57 +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