diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-03-06 17:14:19 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-03-06 18:09:00 +0100 |
| commit | 663b3c968f73f8ffebf32059fed86192ecbee5d8 (patch) | |
| tree | 01bd5692cc2e6ced1af614da1754855c76421425 /spec | |
| parent | 8b53d9efe648f10e0572c2d8017489d0d3bb4755 (diff) | |
| download | gitlab-ce-663b3c968f73f8ffebf32059fed86192ecbee5d8.tar.gz | |
Condense commits already in target branch when updating merge request source branch.
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/services/merge_requests/refresh_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb index 2830da87814..879df0c9c67 100644 --- a/spec/services/merge_requests/refresh_service_spec.rb +++ b/spec/services/merge_requests/refresh_service_spec.rb @@ -61,7 +61,7 @@ describe MergeRequests::RefreshService do it { expect(@merge_request.notes).to be_empty } it { expect(@merge_request).to be_open } - it { expect(@fork_merge_request.notes.last.note).to include('new commit') } + it { expect(@fork_merge_request.notes.last.note).to include('Added 4 commits') } it { expect(@fork_merge_request).to be_open } end |