Claire 85558a5e18 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes.		2023-02-09 12:46:12 +01:00
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-14 22:34:09 +01:00
admin	Fix /api/v1/admin/trends/tags using wrong serializer (#18943)	2023-01-18 16:28:18 +01:00
announcements
apps
crypto
emails
featured_tags
instances
lists
polls
push
statuses
timelines	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-10 09:36:47 +01:00
trends	Allow number of trending hashtags to be customizable (#1884)	2022-11-02 09:20:47 +01:00
accounts_controller.rb
announcements_controller.rb
apps_controller.rb
blocks_controller.rb
bookmarks_controller.rb
conversations_controller.rb
custom_emojis_controller.rb
directories_controller.rb
domain_blocks_controller.rb
endorsements_controller.rb
favourites_controller.rb
featured_tags_controller.rb
filters_controller.rb	Fix irreversible and whole_word parameters handling in /api/v1/filters (#21988)	2022-12-07 00:10:53 +01:00
follow_requests_controller.rb
followed_tags_controller.rb	Fix pagination of followed tags (#20861)	2022-11-17 10:54:10 +01:00
instances_controller.rb
lists_controller.rb	Fix uncaught 500 error on invalid replies_policy (Fix #19097) (#20126)	2022-11-08 16:37:28 +01:00
markers_controller.rb
media_controller.rb
mutes_controller.rb
notifications_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-03 19:23:27 +01:00
polls_controller.rb
preferences_controller.rb
reports_controller.rb
scheduled_statuses_controller.rb
statuses_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
streaming_controller.rb	Apply Rubocop Style/NegatedIfElseCondition (#23451)	2023-02-08 07:07:36 +01:00
suggestions_controller.rb
tags_controller.rb	Fix not being able to follow more than one hashtag (#21285)	2022-11-21 10:35:09 +01:00