Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb		2018-10-01 12:43:20 +02:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-01 12:43:20 +02:00
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-28 17:24:39 +02:00
features	…
fixtures	…
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-01 12:43:20 +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-09-19 21:46:01 +02:00
policies	Add test to disallow remote users from fetching local-only toots	2018-07-31 15:41:04 +02:00
presenters	…
requests	…
routing	…
services	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-20 18:36:00 +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	feat(cookies): Use the same-site attribute to lax (#8626)	2018-09-08 23:54:28 +02:00
spec_helper.rb	Disable simplecov on CircleCI (#7416)	2018-05-09 16:59:58 +02:00