Claire c59fb65ddc Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to glitch-soc's option to hide followers count. Ported upstream changes. Additional changes: - `app/views/application/mailer/_account.html.haml`: Ported glitch-soc's option to hide followers count. - `app/views/settings/flavours/show.html.haml`: Ported the `frontend_asset_url` helper change to glitch-soc.		2024-01-17 18:32:15 +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 '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream	2024-01-15 20:53:16 +01:00
fabrication	Restore console behavior in `test` env (#26401)	2023-08-09 11:26:56 +02:00
fabricators	Move followable_by coverage to suggestions (#28697)	2024-01-12 09:11:34 +00:00
features	Rename and refactor `User#confirm!` to `User#mark_email_as_confirmed!` (#28735)	2024-01-15 18:04:58 +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 '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream	2024-01-17 18:32:15 +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 '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream	2024-01-17 18:32:15 +01:00
policies	Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream	2024-01-15 20:53:16 +01:00
presenters	Merge branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00
requests	Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream	2024-01-15 20:27:41 +01:00
routing	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
search/models/concerns/account	Use Sidekiq `fake!` instead of `inline!` in specs (#25369)	2024-01-10 11:06:58 +00:00
serializers	Add VAPID public key to instance serializer (#28006)	2023-11-29 08:34:36 +00:00
services	Fix registrations not checking MX records for email domain blocks requiring approval (#28608)	2024-01-15 17:10:57 +00:00
support	Use top-level `warn` in JS errors check (#28745)	2024-01-15 21:26:11 +00:00
system	Use Sidekiq `fake!` instead of `inline!` in specs (#25369)	2024-01-10 11:06:58 +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	Disable `Rails/SkipsModelValidations` cop (#28712)	2024-01-15 13:46:47 +00:00
rails_helper.rb	Move streaming `around` config into manager class (#28684)	2024-01-11 10:54:42 +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