summaryrefslogtreecommitdiff
path: root/features/project
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-08-25 12:59:21 -0500
committerDouwe Maan <douwe@selenight.nl>2016-08-25 12:59:21 -0500
commitbbd9a6fe405d0df1c7c9ad09b7c3ff6a0201953f (patch)
treeebe142b4a13ff41691fdc75b348e718c3989a2df /features/project
parent532489dc045d6f0c6a215889be3f1d39097d1c83 (diff)
parenta943ccf10ecf2af3331927cb83268fbc70f43634 (diff)
downloadgitlab-ce-bbd9a6fe405d0df1c7c9ad09b7c3ff6a0201953f.tar.gz
Merge branch 'dz-merge-request-version'
Diffstat (limited to 'features/project')
-rw-r--r--features/project/merge_requests.feature2
1 files changed, 1 insertions, 1 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index 967f2edb243..5aa592e9067 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -24,7 +24,7 @@ Feature: Project Merge Requests
Scenario: I should see target branch when it is different from default
Given project "Shop" have "Bug NS-06" open merge request
When I visit project "Shop" merge requests page
- Then I should see "other_branch" branch
+ Then I should see "feature_conflict" branch
Scenario: I should not see the numbers of diverged commits if the branch is rebased on the target
Given project "Shop" have "Bug NS-07" open merge request with rebased branch