Claire 016d194274 Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, upstream added helpers right next to glitch-soc only helpers. Added upstream's helpers. - `spec/models/status_spec.rb`: Not a real conflict, upstream added specs right next to glitch-soc only specs. Added upstream's tests.		2024-05-06 17:53:51 +02:00
..
accounts	Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream	2024-05-04 16:12:51 +02:00
admin	Fix not being able to block a subdomain of an already-blocked domain through the API (#30119)	2024-05-02 20:56:21 +00:00
announcements	…
apps	…
emails	…
featured_tags	…
instances	…
lists	…
notifications	…
peers	…
polls	…
push	…
statuses	…
timelines	Merge commit 'd27eb181f6ab419d1745a1fe9b94094be17a618f' into glitch-soc/merge-upstream	2024-05-01 17:22:02 +02:00
trends	…
accounts_spec.rb	Add API to get multiple accounts and statuses (#27871)	2024-05-06 15:19:15 +00:00
announcements_spec.rb	…
apps_spec.rb	…
blocks_spec.rb	…
bookmarks_spec.rb	…
conversations_spec.rb	…
csp_spec.rb	…
custom_emojis_spec.rb	…
directories_spec.rb	…
domain_blocks_spec.rb	…
endorsements_spec.rb	…
favourites_spec.rb	…
featured_tags_spec.rb	…
filters_spec.rb	…
follow_requests_spec.rb	…
followed_tags_spec.rb	…
instance_spec.rb	…
lists_spec.rb	…
markers_spec.rb	…
media_spec.rb	…
mutes_spec.rb	…
notifications_spec.rb	…
polls_spec.rb	…
preferences_spec.rb	…
profiles_spec.rb	…
reports_spec.rb	…
scheduled_status_spec.rb	…
statuses_spec.rb	Add API to get multiple accounts and statuses (#27871)	2024-05-06 15:19:15 +00:00
streaming_spec.rb	…
suggestions_spec.rb	…
tags_spec.rb	…