summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2017-02-03 18:02:19 +0000
committerJacob Schatz <jschatz@gitlab.com>2017-02-03 18:02:19 +0000
commit538a6875d3b53f909e9b5b6ef396a457cbcae760 (patch)
tree503cf693557a3e9992a7276bc804cfd579658892 /features
parent3213dfd797fec7014f7fa38ef110cfb785c297a8 (diff)
parentaa91f508369a795878b3ee95556302cdb55d9f6c (diff)
downloadgitlab-ce-538a6875d3b53f909e9b5b6ef396a457cbcae760.tar.gz
Merge branch '25624-anticipate-obstacles-to-removing-turbolinks' into 'master'
Remove Turbolinks Closes #25624 See merge request !8570
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/merge_requests.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index d2fa8cd39af..9f0057cace7 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -501,6 +501,9 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step 'I fill in merge request search with "Fe"' do
fill_in 'issuable_search', with: "Fe"
+ page.within '.merge-requests-holder' do
+ find('.merge-request')
+ end
end
step 'I click the "Target branch" dropdown' do