diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-08-02 15:38:03 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-08-02 15:38:03 +0300 |
| commit | 6515ec09bbfa25027d1b8a1240e09bc1c6edbcfb (patch) | |
| tree | 0113d36deb3a856a4effe6f10f054e6019382a95 /features/project | |
| parent | f8aeb8cdac98108bca5d1be2a382c32df6a500e5 (diff) | |
| download | gitlab-ce-6515ec09bbfa25027d1b8a1240e09bc1c6edbcfb.tar.gz | |
Chnage the way how merge request diff is initialized and saved
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'features/project')
| -rw-r--r-- | features/project/merge_requests.feature | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index 21768c15c17..7673b4284ef 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 |