mastodon/app/controllers/api/v1
Thibaut Girka 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml
2018-08-27 18:09:28 +02:00
..
accounts Public profile endorsements (accounts picked by profile owner) (#8146) 2018-08-09 09:56:53 +02:00
apps
instances
lists Fix low-hanging rubocop gripes (#8458) 2018-08-26 19:22:46 +02:00
push
statuses Introduce OAuth scopes for bookmarks 2018-08-10 15:26:52 +02:00
timelines
accounts_controller.rb
apps_controller.rb
blocks_controller.rb
bookmarks_controller.rb Introduce OAuth scopes for bookmarks 2018-08-10 15:26:52 +02:00
custom_emojis_controller.rb
domain_blocks_controller.rb
endorsements_controller.rb Add API endpoint to list featured accounts (fixes #8315) (#8317) 2018-08-20 18:46:04 +02:00
favourites_controller.rb
filters_controller.rb
follow_requests_controller.rb
follows_controller.rb
instances_controller.rb
lists_controller.rb Fix low-hanging rubocop gripes (#8458) 2018-08-26 19:22:46 +02:00
media_controller.rb
mutes_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-27 18:09:28 +02:00
notifications_controller.rb Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
reports_controller.rb
search_controller.rb Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
statuses_controller.rb Unuse ActiveRecord::Base#cache_key (#8185) 2018-08-19 15:52:38 +02:00
streaming_controller.rb
suggestions_controller.rb