summaryrefslogtreecommitdiff
path: root/app/controllers/concerns/integrations/actions.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-10 18:09:05 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-10 18:09:05 +0000
commit20a86e7f6fd58882025b1c85b21e891d75220da5 (patch)
tree31d400a3790b2b3650415e5caf1cabfbe8d9092e /app/controllers/concerns/integrations/actions.rb
parent04ac4180cb5ba0df460034c7e64862056fd498b3 (diff)
downloadgitlab-ce-20a86e7f6fd58882025b1c85b21e891d75220da5.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/concerns/integrations/actions.rb')
-rw-r--r--app/controllers/concerns/integrations/actions.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/concerns/integrations/actions.rb b/app/controllers/concerns/integrations/actions.rb
index 7bebafae0fd..c0816c2fe9c 100644
--- a/app/controllers/concerns/integrations/actions.rb
+++ b/app/controllers/concerns/integrations/actions.rb
@@ -8,6 +8,9 @@ module Integrations::Actions
include IntegrationsHelper
before_action :integration, only: [:edit, :update, :overrides, :test]
+ before_action :render_404, only: :edit, if: -> do
+ integration.to_param == 'prometheus' && Feature.enabled?(:remove_monitor_metrics)
+ end
urgency :low, [:test]
end