Thibaut Girka 5e0cf92fd1 Merge branch 'master' into glitch-soc/merge-upstream ... No conflicts.		2019-01-19 18:28:37 +01:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-19 18:28:37 +01:00
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
features	rubocop issues - Cleaning up (#8912)	2018-10-08 04:50:11 +02:00
fixtures	Fix undefined method error in sidekiq (#9807)	2019-01-14 17:28:41 +01:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
mailers	Improve e-mail digest (#9689)	2019-01-02 10:47:32 +01:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-13 14:41:06 +01:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
presenters	Change instance_presenter_spec to point to glitch-soc instead of tootsuite	2018-12-23 11:45:26 +01:00
requests	…
routing	…
services	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-19 18:28:37 +01:00
support	…
validators	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +02:00
workers	Add scheduled statuses (#9706)	2019-01-05 12:43:28 +01:00
rails_helper.rb	Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819)	2019-01-15 23:11:46 +01:00
spec_helper.rb	…