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

..

controllers

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-08 19:05:02 -05:00

fabricators

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-25 15:17:21 +00:00

features

Add scenarios for log in (#3497)

2017-06-01 17:25:59 +02:00

fixtures

Added FetchRemoteAccountService spec (#6456)

2018-02-10 17:10:57 +01:00

helpers

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-09 00:17:17 +00:00

lib

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-08 19:05:02 -05:00

mailers

Account archive download (#6460)

2018-02-21 23:21:32 +01:00

models

Merge remote-tracking branch 'origin/master' into gs-master

2018-03-27 10:26:47 -05:00

policies

Update StatusPolicy to check current_account for local_only? toots.

2017-11-17 09:07:21 -06:00

presenters

Isolate each specs for cache store (#6450)

2018-02-17 22:35:05 +01:00

requests

Redesign the landing page, mount public timeline on it (#4122)

2017-07-11 15:27:59 +02:00

routing

Move create/destroy actions for api/v1/statuses to namespace (#3678)

2017-06-10 09:39:26 +02:00

services

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-03-02 21:46:44 -06:00

support

Remove empty strings (#5732)

2017-11-17 10:52:30 +09:00

validators

Merge remote-tracking branch 'origin/master' into gs-master

2018-03-27 10:44:12 -05:00

views

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-04 13:56:58 -05:00

workers

Lists (#5703)

2017-11-18 00:16:48 +01:00

rails_helper.rb

Isolate each specs for cache store (#6450)

2018-02-17 22:35:05 +01:00

spec_helper.rb

Full-text search for authorized statuses (#6423)

2018-02-09 23:04:47 +01:00