summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-19 03:06:07 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-19 03:06:07 +0000
commit7f3bff1556594dcdc1beca40d083ba7263965e21 (patch)
treeab18d957d9bc7b2888c6e9fa9b281a7c1cb8927b /qa
parent8d0aed5e4a6ae59232cfa5ca168fa1b87073520d (diff)
downloadgitlab-ce-7f3bff1556594dcdc1beca40d083ba7263965e21.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
index e9a3b0f75e6..3f99ae644c7 100644
--- a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
+++ b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
@@ -55,8 +55,7 @@ module QA
end
end
- # https://gitlab.com/gitlab-org/gitlab/issues/35156
- describe 'Auto DevOps support', :orchestrated, :kubernetes, :quarantine do
+ describe 'Auto DevOps support', :orchestrated, :kubernetes do
context 'when rbac is enabled' do
before(:all) do
@cluster = Service::KubernetesCluster.new.create!