summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorblizzz <blizzz@arthur-schiwon.de>2018-10-18 10:24:56 +0200
committerGitHub <noreply@github.com>2018-10-18 10:24:56 +0200
commit0c05ed1d3df2fdaf4dffabc697aaa2744396914c (patch)
treebc5454c82c09d8ddf662555eb1f60b757d17f74f /apps
parent2634ceb35b72eac94e6bf4c61640036392c5f97f (diff)
parentd63de5471bf3c8a40bdc9f9e3b5332d2f0b1f2a9 (diff)
downloadnextcloud-server-0c05ed1d3df2fdaf4dffabc697aaa2744396914c.tar.gz
nextcloud-server-0c05ed1d3df2fdaf4dffabc697aaa2744396914c.zip
Merge pull request #11878 from nextcloud/no-require-same-site-cookie-on-assets
Don't require Same Site Cookies on assets
Diffstat (limited to 'apps')
-rw-r--r--apps/theming/lib/Controller/ThemingController.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php
index a1fa5e57836..cc8af2cae3e 100644
--- a/apps/theming/lib/Controller/ThemingController.php
+++ b/apps/theming/lib/Controller/ThemingController.php
@@ -397,6 +397,7 @@ class ThemingController extends Controller {
/**
* @NoCSRFRequired
* @PublicPage
+ * @NoSameSiteCookieRequired
*
* @return FileDisplayResponse|NotFoundResponse
* @throws NotPermittedException
@@ -428,6 +429,7 @@ class ThemingController extends Controller {
/**
* @NoCSRFRequired
* @PublicPage
+ * @NoSameSiteCookieRequired
*
* @return DataDownloadResponse
*/