summaryrefslogtreecommitdiff
path: root/spec/frontend/fixtures
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-21 06:08:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-21 06:08:58 +0000
commit18b8435318887d3fc6e9f9d305967a953cdd7d3f (patch)
tree28cb71f255eb364c224ff24dd085f8cd836951b1 /spec/frontend/fixtures
parent4359b9650ecf0960f04f0fd38fc25bec7b478a11 (diff)
downloadgitlab-ce-18b8435318887d3fc6e9f9d305967a953cdd7d3f.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/fixtures')
-rw-r--r--spec/frontend/fixtures/groups.rb1
-rw-r--r--spec/frontend/fixtures/projects.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/spec/frontend/fixtures/groups.rb b/spec/frontend/fixtures/groups.rb
index 237fc711594..2421b67a130 100644
--- a/spec/frontend/fixtures/groups.rb
+++ b/spec/frontend/fixtures/groups.rb
@@ -15,6 +15,7 @@ describe 'Groups (JavaScript fixtures)', type: :controller do
end
before do
+ stub_feature_flags(new_variables_ui: false)
group.add_maintainer(admin)
sign_in(admin)
end
diff --git a/spec/frontend/fixtures/projects.rb b/spec/frontend/fixtures/projects.rb
index af5b70fbbeb..ff21dbaebe8 100644
--- a/spec/frontend/fixtures/projects.rb
+++ b/spec/frontend/fixtures/projects.rb
@@ -20,6 +20,7 @@ describe 'Projects (JavaScript fixtures)', type: :controller do
end
before do
+ stub_feature_flags(new_variables_ui: false)
project.add_maintainer(admin)
sign_in(admin)
allow(SecureRandom).to receive(:hex).and_return('securerandomhex:thereisnospoon')