Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-10 21:09:05 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-10 21:09:05 +0300
commit20a86e7f6fd58882025b1c85b21e891d75220da5 (patch)
tree31d400a3790b2b3650415e5caf1cabfbe8d9092e /spec/controllers
parent04ac4180cb5ba0df460034c7e64862056fd498b3 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/admin/integrations_controller_spec.rb1
-rw-r--r--spec/controllers/groups/settings/integrations_controller_spec.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/spec/controllers/admin/integrations_controller_spec.rb b/spec/controllers/admin/integrations_controller_spec.rb
index fed96f6a6c7..9e2a2900b33 100644
--- a/spec/controllers/admin/integrations_controller_spec.rb
+++ b/spec/controllers/admin/integrations_controller_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe Admin::IntegrationsController do
let(:admin) { create(:admin) }
before do
+ stub_feature_flags(remove_monitor_metrics: false)
sign_in(admin)
end
diff --git a/spec/controllers/groups/settings/integrations_controller_spec.rb b/spec/controllers/groups/settings/integrations_controller_spec.rb
index 377c38ce087..3ae43c8ab7c 100644
--- a/spec/controllers/groups/settings/integrations_controller_spec.rb
+++ b/spec/controllers/groups/settings/integrations_controller_spec.rb
@@ -7,6 +7,7 @@ RSpec.describe Groups::Settings::IntegrationsController do
let_it_be(:group) { create(:group) }
before do
+ stub_feature_flags(remove_monitor_metrics: false)
sign_in(user)
end