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		2018-06-21 20:49:57 +02:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-23 16:05:19 +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	keyword mute: use mentions scope in home feed filtering (#454)	2018-06-12 17:14:35 -05:00
mailers
models	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +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 remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-06-12 13:17:21 +00: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