11 commits

Author	SHA1	Message	Date
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
ThibG	8ab081ec32	Add manifest_src to CSP, add blob to connect_src (#8967)	2018-10-12 19:07:30 +02:00
Eugen Rochko	edc7f895be	Fix CSP headers blocking media and development environment (#8962) ... Regression from #8957	2018-10-12 01:43:09 +02:00
ThibG	2d27c11061	Set Content-Security-Policy rules through RoR's config (#8957) ... * Set CSP rules in RoR's configuration * Override CSP setting in the embed controller to allow frames	2018-10-11 20:35:46 +02:00
Rey Tucker	40d04a3209	Add manifest_src to CSP ... Fixes manifest.json not being loaded because of CSP violation h/t https://vulpine.club/@binary/100662852252438648	2018-09-03 22:37:54 +02:00
Thibaut Girka	c4b3479173	Fix CSP with S3/SWIFT hosts	2018-08-28 22:10:40 +02:00
Thibaut Girka	3fe5029fbe	Adjust CSP to fix image resizing	2018-08-28 16:58:55 +02:00
Thibaut Girka	0ddf439999	Only apply CSP in production mode	2018-08-23 22:58:40 +02:00
Thibaut Girka	48db3b3c99	Tighten CSP while allowing CDN hosts	2018-08-23 22:58:40 +02:00
Thibaut Girka	e7a72439f1	Move CSP headers to the appropriate Rails configuration ... Also drop dev-static.glitch.social reference.	2018-08-22 20:39:33 +02:00
Yamagishi Kazutoshi	50529cbceb	Upgrade Rails to version 5.2.0 (#5898)	2018-04-12 14:45:17 +02:00