Jeremy Kescher 2df3b9f803 Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/serializers/initial_state_serializer.rb		2024-04-11 21:50:48 +02:00
..
associations.rb	Merge branch 'glitch-soc' into develop	2024-03-14 20:01:30 +01:00
avatar.rb	Model concerns organization into module namespaces (#28149)	2023-12-01 11:00:41 +00:00
counters.rb	Add explicit dependent: nil to associations (#28169)	2023-12-01 15:52:47 +00:00
finder_concern.rb	Move "everyone" role and "instance actor" account magic number IDs to constants (#29260)	2024-02-19 11:09:43 +00:00
header.rb	Model concerns organization into module namespaces (#28149)	2023-12-01 11:00:41 +00:00
interactions.rb	Merge branch 'refs/heads/glitch-soc' into develop	2024-04-11 21:50:48 +02:00
merging.rb	Reattribute notification-related records if possible when merging accounts (#29694)	2024-03-22 16:21:53 +00:00
search.rb	Change algorithm of follow recommendations (#28314)	2023-12-19 10:59:43 +00:00
statuses_search.rb	Use enum-generated public_visibility scope on Status (#28156)	2024-03-14 09:31:57 +00:00