You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/spec
Thibaut Girka b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	config/locales/simple_form.ja.yml
8 years ago
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
fabricators Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
features
fixtures Slightly reduce RAM usage (#7301) 8 years ago
helpers Merge remote-tracking branch 'origin/master' into gs-master 8 years ago
lib Merge remote-tracking branch 'origin/master' into merge-upstream 8 years ago
mailers
models Merge branch 'master' into glitch-soc/merge 8 years ago
policies
presenters
requests Use raw status code on have_http_status (#7214) 8 years ago
routing
services Merge branch 'master' into glitch-soc/master 8 years ago
support
validators Merge remote-tracking branch 'origin/master' into gs-master 8 years ago
views Merge remote-tracking branch 'origin/master' into gs-master 8 years ago
workers
rails_helper.rb Slightly reduce RAM usage (#7301) 8 years ago
spec_helper.rb Disable simplecov on CircleCI (#7416) 8 years ago