From c51770292e1aa8f72ea89fb03eade85fa8ee04ff Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 23 Aug 2023 17:49:33 +0200 Subject: [PATCH] Add temporary patch for lfs object URL --- ...condition-for-csr-policy-allow-lfs_v16.3.0.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch diff --git a/assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch b/assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch new file mode 100644 index 00000000..ef82ccff --- /dev/null +++ b/assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch @@ -0,0 +1,13 @@ +diff --git a/lib/gitlab/content_security_policy/config_loader.rb b/lib/gitlab/content_security_policy/config_loader.rb +index 9fb3c7d362f..d012c8b3b7b 100644 +--- a/lib/gitlab/content_security_policy/config_loader.rb ++++ b/lib/gitlab/content_security_policy/config_loader.rb +@@ -84,7 +84,7 @@ def allow_snowplow_micro(directives) + end + + def allow_lfs(directives) +- return unless Gitlab.config.lfs.enabled && LfsObjectUploader.direct_download_enabled? ++ return unless Gitlab.config.lfs.enabled && Gitlab.config.lfs.object_store.enabled && LfsObjectUploader.direct_download_enabled? + + lfs_url = build_lfs_url + return unless lfs_url.present?