monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/controllers/api/v1
History
David Yip 67e77f230e
Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	app/serializers/initial_state_serializer.rb

The glitch flavour isn't yet pulling custom emoji data on its own (see
https://github.com/tootsuite/mastodon/pull/7047).  Once that gets into
the glitch flavour, we can eliminate the custom_emojis load.
 		2018-04-08 19:05:02 -05:00
..
accounts Enable updating additional account information from user preferences via rest api (#6789) 2018-04-08 13:43:10 +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
statuses Fix unpermitted parameters warning when generating pagination URLs (#6995) 2018-04-02 02:09:50 +02:00
timelines Merge remote-tracking branch 'origin/master' into gs-master 2018-04-01 20:24:50 -05:00
accounts_controller.rb Ensure that boolean params in the API are parsed for truthiness (#6575) 2018-03-01 02:47:59 +01:00
apps_controller.rb
…
blocks_controller.rb Fix unpermitted parameters warning when generating pagination URLs (#6995) 2018-04-02 02:09:50 +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 Limit users to 50 lists, remove pagination from lists API (#5933) 2017-12-09 01:32:29 +01:00
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 Fix unpermitted parameters warning when generating pagination URLs (#6995) 2018-04-02 02:09:50 +02:00
streaming_controller.rb
…