Thibaut Girka dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.		2018-10-22 17:51:38 +02:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +02:00
features	rubocop issues - Cleaning up (#8912)	2018-10-08 04:50:11 +02:00
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-10-22 17:51:38 +02:00
mailers
models	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +02:00
policies
presenters
requests
routing
services	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +02:00
support
validators
views	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +02:00
workers
rails_helper.rb	rubocop issues - Cleaning up (#8912)	2018-10-08 04:50:11 +02:00
spec_helper.rb