David Yip 8142bd2553 Merge remote-tracking branch 'tootsuite/master' into merge-upstream ...

Conflicts:
 	app/models/status.rb

The conflict in the Status model was due to
https://github.com/tootsuite/mastodon/commit/5bf500338478f819a65d25636a0af61a482972d3.
It was resolved by accepting tootsuite's changes.

2018-06-07 05:13:49 -05:00

..

controllers

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

2018-06-07 05:13:49 -05:00

fabricators

Merge branch 'master' into glitch-soc/merge-upstream

2018-05-23 16:05:19 +02: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 'tootsuite/master' into merge-upstream

2018-06-07 05:13:49 -05:00

mailers

Account archive download (#6460)

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

models

Escape metacharacters in non-whole-word keyword mutes. Fixes #533.

2018-06-05 02:49:28 -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 branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02: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

Disable simplecov on CircleCI (#7416)

2018-05-09 16:59:58 +02:00