mastodon/spec
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
2018-05-10 00:03:28 +02:00
..
controllers Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
fabricators Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
features
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
models Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
policies
presenters
requests Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
routing
services Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
support
validators
views Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
workers
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