mastodon/app/controllers/api/v1
Thibaut Girka 78ac246b87 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	Gemfile

Solved conflicts by using upstream's line for posix-spawn
2018-05-16 21:52:38 +02:00
..
accounts Do not use permitted_for scope when querying pinned statuses (#7510) 2018-05-16 12:30:14 +02:00
apps
instances Represent numbers by strings in instance activity API (#6198) 2018-01-05 22:38:33 +01:00
lists Fix unpermitted parameters warning when generating pagination URLs (#6995) 2018-04-02 02:09:50 +02:00
push Fix 404 for GET /api/v1/push/subscription (#7472) 2018-05-13 21:45:18 +02:00
statuses Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
timelines Direct messages column (#4514) 2018-04-18 13:09:06 +02:00
accounts_controller.rb Return HTTP 410 for suspended accounts in GET /api/v1/accounts/:id (#7287) 2018-04-30 09:12:36 +02:00
apps_controller.rb
blocks_controller.rb Fix unpermitted parameters warning when generating pagination URLs (#6995) 2018-04-02 02:09:50 +02:00
bookmarks_controller.rb Add backend support for bookmarks 2018-04-11 20:40:29 +02:00
custom_emojis_controller.rb
domain_blocks_controller.rb Fix unpermitted parameters warning when generating pagination URLs (#6995) 2018-04-02 02:09:50 +02:00
favourites_controller.rb Fix unpermitted parameters warning when generating pagination URLs (#6995) 2018-04-02 02:09:50 +02:00
follow_requests_controller.rb Fix unpermitted parameters warning when generating pagination URLs (#6995) 2018-04-02 02:09:50 +02:00
follows_controller.rb
instances_controller.rb
lists_controller.rb
media_controller.rb Focal points (#6520) 2018-02-22 00:35:46 +01:00
mutes_controller.rb Merge remote-tracking branch 'origin/master' into gs-master 2018-04-01 20:24:50 -05:00
notifications_controller.rb Merge remote-tracking branch 'origin/master' into gs-master 2018-04-01 20:24:50 -05:00
reports_controller.rb Federated reports (#6570) 2018-02-28 06:54:55 +01:00
search_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
statuses_controller.rb Paginate descendant statuses in public page (#7148) 2018-04-23 19:27:35 +02:00
streaming_controller.rb