diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-28 19:54:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-28 19:54:04 +0300 |
| commit | 60d9342b3b0dfb6b1fab71e8edff869529dd3794 (patch) | |
| tree | 6304809f9949ce4592e3808b92bb5bfbf5dbb1d9 /lib | |
| parent | 043c499d369387a8128ca4d7de69dd4ae0f53a38 (diff) | |
Add latest changes from gitlab-org/gitlab@16-3-stable-ee
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/content_security_policy/config_loader.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/content_security_policy/config_loader.rb b/lib/gitlab/content_security_policy/config_loader.rb index 9fb3c7d362f..59a4e425b85 100644 --- a/lib/gitlab/content_security_policy/config_loader.rb +++ b/lib/gitlab/content_security_policy/config_loader.rb @@ -84,7 +84,7 @@ module Gitlab end def allow_lfs(directives) - return unless Gitlab.config.lfs.enabled && LfsObjectUploader.direct_download_enabled? + return unless Gitlab.config.lfs.enabled && LfsObjectUploader.object_store_enabled? && LfsObjectUploader.direct_download_enabled? lfs_url = build_lfs_url return unless lfs_url.present? |