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	…
controllers	…
fabrication	…
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	…
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	…
models	Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream	2024-04-06 19:35:21 +02:00
policies	…
presenters	…
requests	Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream	2024-04-06 21:01:40 +02:00
routing	…
search/models/concerns/account	…
serializers	…
services	Improve specs for severed relationships (#29688)	2024-03-22 16:25:36 +00:00
support	…
system	…
validators	…
views	Remove unused `show_landing_strip?` helper method (#29618)	2024-03-18 08:55:54 +00:00
workers	…
rails_helper.rb	…
spec_helper.rb	…