David Yip a6fb1c58ee Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
	.env.production.sample
	app/controllers/auth/confirmations_controller.rb
	db/schema.rb

2018-02-04 16:36:19 -06:00

..

controllers

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

2018-01-24 19:17:11 +00:00

fabricators

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

2018-02-04 16:36:19 -06:00

features

…

fixtures

Fix XML oEmbed support discovery (#6104)

2017-12-27 03:29:49 +01:00

helpers

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

2017-11-16 22:52:37 -06:00

lib

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

2018-01-08 10:17:15 +00:00

mailers

Make text e-mails consistent with HTML ones in UserMailer (#6291)

2018-01-20 01:32:05 +01:00

models

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

2018-02-04 16:36:19 -06:00

policies

Update StatusPolicy to check current_account for local_only? toots.

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

presenters

Add tests for AccountRelationshipsPresenter (#5805)

2017-11-24 14:41:04 +01:00

requests

…

routing

…

services

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

2018-01-24 19:17:11 +00:00

support

Remove empty strings (#5732)

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

validators

Fix StatusLengthValidator tests

2017-09-02 11:37:40 -05:00

views

fix haml quotes in a bid to make travis less grumpy

2017-10-06 09:07:04 +02:00

workers

Lists (#5703)

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

rails_helper.rb

Fix force_ssl conditional (#6201)

2018-01-07 15:19:23 +01:00

spec_helper.rb

Minor performance improvement for test suite (#4678)

2017-08-24 13:31:55 +02:00