summaryrefslogtreecommitdiff
path: root/lib/gitlab/pages/settings.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-05-19 15:44:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-19 15:44:42 +0000
commit4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch)
tree5423a1c7516cffe36384133ade12572cf709398d /lib/gitlab/pages/settings.rb
parente570267f2f6b326480d284e0164a6464ba4081bc (diff)
downloadgitlab-ce-4555e1b21c365ed8303ffb7a3325d773c9b8bf31.tar.gz
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'lib/gitlab/pages/settings.rb')
-rw-r--r--lib/gitlab/pages/settings.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/gitlab/pages/settings.rb b/lib/gitlab/pages/settings.rb
index be71018e851..b35683c9dec 100644
--- a/lib/gitlab/pages/settings.rb
+++ b/lib/gitlab/pages/settings.rb
@@ -11,10 +11,6 @@ module Gitlab
super
end
- def local_store
- @local_store ||= ::Gitlab::Pages::Stores::LocalStore.new(super)
- end
-
private
def disk_access_denied?
@@ -25,7 +21,7 @@ module Gitlab
def report_denied_disk_access
raise DiskAccessDenied if disk_access_denied?
- rescue => e
+ rescue StandardError => e
::Gitlab::ErrorTracking.track_exception(e)
end
end