Claire 1d1c3a808a Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream ... Conflicts: - `app/models/user_settings.rb`: Upstream removed a setting textually adjacent to a glitch-soc-only setting. Removed the setting glitch-soc removed.		2024-04-06 21:01:40 +02:00
..
chewy
config/initializers/rack	Use unchanging github links in docs/comments (#29545)	2024-03-11 15:14:55 +00:00
controllers	Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream	2024-03-14 17:27:16 +01:00
fabrication	Ensure unique values in fabricators (#29515)	2024-03-11 08:53:24 +00:00
fabricators	Fix results/query in api/v1/featured_tags/suggestions (#29597)	2024-03-22 15:08:27 +00:00
features	Improve specs for severed relationships (#29688)	2024-03-22 16:25:36 +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 commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream	2024-03-19 19:21:12 +01:00
lib	Merge commit 'd702a03a0c35fc631a0fa456532946e6751cbbfd' into glitch-soc/merge-upstream	2024-03-15 22:48:04 +01:00
locales
mailers	Add notification email on invalid second authenticator (#28822)	2024-01-22 13:55:43 +00:00
models	Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream	2024-04-06 19:35:21 +02: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 '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream	2024-04-06 21:01:40 +02:00
routing
search/models/concerns/account	Use enum-generated public_visibility scope on Status (#28156)	2024-03-14 09:31:57 +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	Improve specs for severed relationships (#29688)	2024-03-22 16:25:36 +00:00
support	Add include_pagination_headers matcher to check Link header in api specs (#29596)	2024-03-15 10:17:45 +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 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream	2024-03-13 20:14:18 +01:00
views	Remove unused show_landing_strip? helper method (#29618)	2024-03-18 08:55:54 +00:00
workers	Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream	2024-02-24 15:02:28 +01:00
rails_helper.rb	Use before_all block to setup requests/cache_spec data (#29437)	2024-03-13 08:38:57 +00:00
spec_helper.rb	Change registrations to be disabled by default for new servers (#29280)	2024-02-22 13:28:19 +00:00