mastodon/spec
Thibaut Girka 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	README.md

Discarded upstream changes to the README, kept our version.
2018-09-03 14:33:06 +02:00
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-08-27 18:09:28 +02:00
fabricators Merge branch 'master' into glitch-soc/merge-upstream 2018-08-28 17:24:39 +02:00
features
fixtures Slightly reduce RAM usage (#7301) 2018-05-02 18:58:48 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:23:24 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-08-31 19:10:57 +02:00
mailers
models Merge branch 'master' into glitch-soc/merge-upstream 2018-08-31 19:10:57 +02:00
policies Add test to disallow remote users from fetching local-only toots 2018-07-31 15:41:04 +02:00
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/merge-upstream 2018-09-03 14:33:06 +02:00
support
validators
views Merge branch 'master' into glitch-soc/merge-upstream 2018-08-31 19:10:57 +02: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