summaryrefslogtreecommitdiff
path: root/spec/features/merge_request/user_creates_merge_request_spec.rb
diff options
context:
space:
mode:
authorPaul Slaughter <pslaughter@gitlab.com>2019-02-13 05:35:17 -0600
committerPaul Slaughter <pslaughter@gitlab.com>2019-02-13 05:35:17 -0600
commit09e58d3f8a965992f2abc72246bd405c984c948c (patch)
treece2ae2dd53b3961404d2fe7bb7136f62bca7006d /spec/features/merge_request/user_creates_merge_request_spec.rb
parentda1aaaf2e56a6ed516e603a5a22044d89f61b0c0 (diff)
downloadgitlab-ce-09e58d3f8a965992f2abc72246bd405c984c948c.tar.gz
CE Port of Multiple merge request approval rules
EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9001
Diffstat (limited to 'spec/features/merge_request/user_creates_merge_request_spec.rb')
-rw-r--r--spec/features/merge_request/user_creates_merge_request_spec.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/features/merge_request/user_creates_merge_request_spec.rb b/spec/features/merge_request/user_creates_merge_request_spec.rb
index 38b4e4a6d1b..ea2bb1503bb 100644
--- a/spec/features/merge_request/user_creates_merge_request_spec.rb
+++ b/spec/features/merge_request/user_creates_merge_request_spec.rb
@@ -8,6 +8,8 @@ describe "User creates a merge request", :js do
let(:user) { create(:user) }
before do
+ stub_feature_flags(approval_rules: false)
+
project.add_maintainer(user)
sign_in(user)
end