summaryrefslogtreecommitdiff
path: root/spec/features/merge_requests/cherry_pick_spec.rb
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2017-05-23 14:10:16 +0300
committerValery Sizov <valery@gitlab.com>2017-05-23 14:10:16 +0300
commit2158beddeed688fee701a00d21752dd253866548 (patch)
treea615157f9ada6da50717b8da69ec45c3f06b378d /spec/features/merge_requests/cherry_pick_spec.rb
parent719e30c53d1d0690fa9e96fa488047e0a68d00a2 (diff)
parent12e77890c29c0451ac7a1a59727df4d56bc9741b (diff)
downloadgitlab-ce-2158beddeed688fee701a00d21752dd253866548.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 17489-hide-code-from-guests
Diffstat (limited to 'spec/features/merge_requests/cherry_pick_spec.rb')
-rw-r--r--spec/features/merge_requests/cherry_pick_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_requests/cherry_pick_spec.rb b/spec/features/merge_requests/cherry_pick_spec.rb
index dfe7c910a10..6ba681e36f7 100644
--- a/spec/features/merge_requests/cherry_pick_spec.rb
+++ b/spec/features/merge_requests/cherry_pick_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe 'Cherry-pick Merge Requests' do
+describe 'Cherry-pick Merge Requests', js: true do
let(:user) { create(:user) }
let(:group) { create(:group) }
let(:project) { create(:project, namespace: group) }