diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-07 03:13:10 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-07 03:13:10 +0300 |
| commit | 7dadd423d5279a67cad6d7919370432931deee3e (patch) | |
| tree | 64fc48cdd5a1350d22b5a9c68c2a904c7b3cd5c4 /spec | |
| parent | 0625d68f7510a2f2203bfe2c57f5927a0121c561 (diff) | |
| parent | 84ebc22ad2d9296d23b442948dd3435b33d36cbe (diff) | |
Merge branch 'condensed-mr-commits' into 'master'
Condense commits already in target branch when updating merge request source branch.
Resolves https://dev.gitlab.org/gitlab/gitlabhq/issues/2043.
(Not shown in screenshot, but works fine with rebases as well)
See merge request !1648
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 |