diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-06 12:09:21 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-06 12:09:21 +0000 |
commit | ebed39e3cedad74e1a1ee4e8d33adfb8bbdc7040 (patch) | |
tree | ae91160251c527eb063413ff9e530b6da96eb74d /lib/gitlab/pages/settings.rb | |
parent | 61ee5c363522f2639d1c515a74b9b02b7672c7c2 (diff) | |
download | gitlab-ce-ebed39e3cedad74e1a1ee4e8d33adfb8bbdc7040.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/pages/settings.rb')
-rw-r--r-- | lib/gitlab/pages/settings.rb | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/lib/gitlab/pages/settings.rb b/lib/gitlab/pages/settings.rb index 8650a80a85e..0e77259a0de 100644 --- a/lib/gitlab/pages/settings.rb +++ b/lib/gitlab/pages/settings.rb @@ -6,12 +6,22 @@ module Gitlab DiskAccessDenied = Class.new(StandardError) def path - if ::Gitlab::Runtime.web_server? && !::Gitlab::Runtime.test_suite? - raise DiskAccessDenied - end + ::Gitlab::ErrorTracking.track_exception(DiskAccessDenied.new) if disk_access_denied? super end + + def local_store + @local_store ||= ::Gitlab::Pages::Stores::LocalStore.new(super) + end + + private + + def disk_access_denied? + return true unless ::Settings.pages.local_store&.enabled + + ::Gitlab::Runtime.web_server? && !::Gitlab::Runtime.test_suite? + end end end end |