Claire a482932649 Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Not a real conflict, upstream fixed a bug in a line adjacent to code modified by glitch-soc. Ported upstream's change.		2024-02-27 19:20:57 +01:00
..
chewy	…
config/initializers/rack	…
controllers	Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream	2024-02-27 19:20:57 +01:00
fabrication	…
fabricators	Move followable_by coverage to suggestions (#28697)	2024-01-12 09:11:34 +00:00
features	Reduce `RSpec/MultipleExpectations` in captcha feature spec (#29226)	2024-02-16 07:52:57 +00:00
fixtures	Add end-to-end test for OCR in media uploads (#29148)	2024-02-08 19:13:44 +00:00
generators	…
helpers	Merge pull request from GHSA-jhrq-qvrm-qr36	2024-02-16 12:17:15 +01:00
lib	Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream	2024-02-24 14:46:14 +01:00
locales	…
mailers	Add notification email on invalid second authenticator (#28822)	2024-01-22 13:55:43 +00:00
models	Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream	2024-02-24 15:02:28 +01:00
policies	Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream	2024-01-15 20:53:16 +01:00
presenters	…
requests	Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream	2024-02-26 17:43:16 +01:00
routing	…
search/models/concerns/account	Use Sidekiq `fake!` instead of `inline!` in specs (#25369)	2024-01-10 11:06:58 +00:00
serializers	Change `source` attribute of `Suggestion` entity in `/api/v2/suggestions` back to a string (#29108)	2024-02-06 17:10:17 +00:00
services	Merge commit '491dd9764244c8adf37861f00d916c96bdbfdaf8' into glitch-soc/merge-upstream	2024-02-24 15:33:36 +01:00
support	Add basic end-to-end test for admin moderation interface (#29424)	2024-02-27 15:18:06 +00:00
system	Add basic end-to-end test for admin moderation interface (#29424)	2024-02-27 15:18:06 +00:00
validators	Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream	2024-02-24 14:46:14 +01:00
views	…
workers	Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream	2024-02-24 15:02:28 +01:00
rails_helper.rb	Use `capture_emails` helper to improve email assertions in specs (#29245)	2024-02-19 15:57:47 +00:00
spec_helper.rb	Change registrations to be disabled by default for new servers (#29280)	2024-02-22 13:28:19 +00:00