Jeremy Kescher 0e634397c3 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # Gemfile.lock		2023-02-21 00:40:08 +01:00
..
bookmarks_controller.rb	Fix not being able to unbookmark toots when blocked by their author (#14604)	2020-08-19 19:02:06 +02:00
favourited_by_accounts_controller.rb	Autofix Rubocop Style/IfUnlessModifier (#23697)	2023-02-18 12:37:47 +01:00
favourites_controller.rb	Fix not being able to unfavorite toots one has lost access to (#15192)	2020-11-21 06:18:09 +01:00
histories_controller.rb	Add edit history to web UI (#17390)	2022-02-09 01:17:07 +01:00
mutes_controller.rb	Add more tests for ActivityPub controllers (#13585)	2020-05-03 16:30:36 +02:00
pins_controller.rb	Remove useless respond_to calls (#13208)	2020-03-06 01:29:38 +01:00
reactions_controller.rb	change reaction api to match other interactions	2022-12-09 23:08:42 +01:00
reblogged_by_accounts_controller.rb	Autofix Rubocop Style/IfUnlessModifier (#23697)	2023-02-18 12:37:47 +01:00
reblogs_controller.rb	Fix being unable to unboost when blocked by their author (#14308)	2020-07-15 14:43:19 +02:00
sources_controller.rb	Add support for editing for published statuses (#16697)	2022-01-19 22:37:27 +01:00
translations_controller.rb	Add user content translations with configurable backends (#19218)	2022-09-23 23:00:12 +02:00