Claire 077e0c6812 Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system.		2023-12-20 22:16:50 +01:00
..
accounts	Add `Account#unavailable?` and `Account#permanently_unavailable?` aliases (#28053)	2023-11-30 15:43:26 +00:00
admin	…
announcements	…
apps	…
crypto	…
emails	…
featured_tags	…
instances	Convert `/instances/*` controller specs to request specs (#27988)	2023-11-20 11:05:28 +00:00
lists	…
peers	…
polls	…
profile	…
push	…
statuses	Remove `default_scope` from `StatusEdit` class (#28042)	2023-11-23 09:26:11 +00:00
timelines	Merge commit '7e1a77ea51e6dc4aecbf678f8928aa96698fa072' into glitch-soc/merge-upstream	2023-12-19 19:51:40 +01:00
trends	…
accounts_controller.rb	Fix `Lint/RedundantSafeNavigation` cop (#28172)	2023-12-01 15:52:56 +00:00
announcements_controller.rb	…
apps_controller.rb	…
blocks_controller.rb	…
bookmarks_controller.rb	…
conversations_controller.rb	Change link previews to keep original URL from the status (#27312)	2023-11-13 09:58:28 +00:00
custom_emojis_controller.rb	…
directories_controller.rb	…
domain_blocks_controller.rb	…
endorsements_controller.rb	…
favourites_controller.rb	…
featured_tags_controller.rb	…
filters_controller.rb	…
follow_requests_controller.rb	…
followed_tags_controller.rb	…
instances_controller.rb	…
invites_controller.rb	Add support for invite codes in the registration API (#27805)	2023-11-13 13:27:00 +00:00
lists_controller.rb	…
markers_controller.rb	…
media_controller.rb	…
mutes_controller.rb	…
notifications_controller.rb	…
polls_controller.rb	…
preferences_controller.rb	…
reports_controller.rb	…
scheduled_statuses_controller.rb	…
statuses_controller.rb	…
streaming_controller.rb	…
suggestions_controller.rb	…
tags_controller.rb	…