Claire ab59743c13 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/mailer.html.haml`: Upstream removed a line close to one modified by glitch-soc. Removed the line as upstream did.		2023-01-14 22:34:09 +01:00
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-14 22:34:09 +01:00
admin	Fix changing domain block severity not undoing individual account effects (#22135)	2022-12-15 17:45:02 +01:00
announcements
apps
crypto
emails
featured_tags
instances	Change about page to be mounted in the web UI (#19345)	2022-10-13 14:42:37 +02:00
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	Change featured tag updates to add/remove activity (#19409)	2022-10-22 18:30:55 +02:00
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	2022-12-15 20:25:25 +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	2022-11-12 13:28:03 +01:00
streaming_controller.rb
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