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	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-08 19:05:02 -05:00
apps	Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)	2017-09-30 22:05:42 +02:00
lists	Lists (#5703)	2017-11-18 00:16:48 +01:00
statuses	Change IDs to strings rather than numbers in API JSON output (#5019)	2017-09-20 14:53:48 +02:00
timelines	Lists (#5703)	2017-11-18 00:16:48 +01:00
accounts_controller_spec.rb	Break out nested relationship API keys (#5887)	2017-12-06 16:10:54 +01:00
apps_controller_spec.rb	Fix tests, update goldfinger to catch XML errors	2016-09-30 23:08:29 +02:00
blocks_controller_spec.rb	Fix pagination in Api::V1::BlocksController (#5285)	2017-10-09 17:30:31 +02:00
custom_emojis_controller_spec.rb	New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)	2017-09-23 01:57:23 +02:00
domain_blocks_controller_spec.rb	Introduce access token fabricators (#4401)	2017-07-27 15:16:07 +02:00
favourites_controller_spec.rb	Don't send Link header when don't know prev and next links (#4633)	2017-08-18 10:42:59 +02:00
follow_requests_controller_spec.rb	Introduce access token fabricators (#4401)	2017-07-27 15:16:07 +02:00
follows_controller_spec.rb	Fix POST /api/v1/follows error when already following (#4878)	2017-09-10 15:09:06 +02:00
instances_controller_spec.rb	Introduce access token fabricators (#4401)	2017-07-27 15:16:07 +02:00
lists_controller_spec.rb	Lists (#5703)	2017-11-18 00:16:48 +01:00
media_controller_spec.rb	Add ability to specify alternative text for media attachments (#5123)	2017-09-28 15:31:31 +02:00
mutes_controller_spec.rb	Optional notification muting (#5087)	2017-11-15 03:56:41 +01:00
notifications_controller_spec.rb	Introduce access token fabricators (#4401)	2017-07-27 15:16:07 +02:00
reports_controller_spec.rb	Introduce access token fabricators (#4401)	2017-07-27 15:16:07 +02:00
search_controller_spec.rb	Introduce access token fabricators (#4401)	2017-07-27 15:16:07 +02:00
statuses_controller_spec.rb	Introduce access token fabricators (#4401)	2017-07-27 15:16:07 +02:00
streaming_controller_spec.rb	Redirect to streaming_api_base_url (#3579)	2017-06-05 12:09:29 +02:00