David Yip c816701550

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

Conflicts:
 	.travis.yml
 	Gemfile.lock
 	README.md
 	app/controllers/settings/follower_domains_controller.rb
 	app/controllers/statuses_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/lib/feed_manager.rb
 	app/models/media_attachment.rb
 	app/models/mute.rb
 	app/models/status.rb
 	app/services/mute_service.rb
 	app/views/home/index.html.haml
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/ca.yml
 	config/locales/en.yml
 	config/locales/es.yml
 	config/locales/fr.yml
 	config/locales/nl.yml
 	config/locales/pl.yml
 	config/locales/pt-BR.yml
 	config/themes.yml

2018-05-03 17:23:44 -05:00

..

controllers

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

2018-05-03 17:23:44 -05:00

fabricators

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

2018-05-03 17:23:44 -05:00

features

Add scenarios for log in (#3497)

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

fixtures

Slightly reduce RAM usage (#7301)

2018-05-02 18:58:48 +02:00

helpers

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

2018-05-03 17:23:44 -05:00

lib

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

2018-05-03 17:23:44 -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-05-03 17:23:44 -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

Use raw status code on have_http_status (#7214)

2018-04-21 21:35:07 +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 gs-master

2018-05-03 17:23:44 -05: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-05-03 17:23:44 -05:00

workers

Lists (#5703)

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

rails_helper.rb

Slightly reduce RAM usage (#7301)

2018-05-02 18:58:48 +02:00

spec_helper.rb

Slightly reduce RAM usage (#7301)

2018-05-02 18:58:48 +02:00