mastodon/spec
Thibaut Girka b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	config/locales/simple_form.ja.yml
2018-05-19 22:41:10 +02:00
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-05-19 22:41:10 +02:00
fabricators Merge branch 'master' into glitch-soc/merge-upstream 2018-05-19 22:41:10 +02: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 merge-upstream 2018-05-18 08:47:10 -05:00
mailers Account archive download (#6460) 2018-02-21 23:21:32 +01:00
models Merge branch 'master' into glitch-soc/merge 2018-05-11 18:12:42 +02:00
policies
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
services Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
support
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
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