You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields		7 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
features	…
fixtures	Slightly reduce RAM usage (#7301)	7 years ago
helpers	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
lib	keyword mute: use mentions scope in home feed filtering (#454)	7 years ago
mailers	Account archive download (#6460)	7 years ago
models	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
policies	Update StatusPolicy to check current_account for local_only? toots.	7 years ago
presenters	Isolate each specs for cache store (#6450)	7 years ago
requests	Use raw status code on have_http_status (#7214)	7 years ago
routing	…
services	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
support	Remove empty strings (#5732)	7 years ago
validators	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
views	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
workers	Lists (#5703)	7 years ago
rails_helper.rb	Slightly reduce RAM usage (#7301)	7 years ago
spec_helper.rb	Disable simplecov on CircleCI (#7416)	7 years ago