mastodon-glitch/spec
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
helpers
lib
mailers Make text e-mails consistent with HTML ones in UserMailer () 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
presenters
requests
routing
services Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-24 19:17:11 +00:00
support
validators
views
workers
rails_helper.rb
spec_helper.rb