diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-11-23 14:55:23 +0800 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-11-24 18:26:29 +0800 |
| commit | 6df22f72c6c312199c547e017ce1f947cf88e34c (patch) | |
| tree | c91130ad2d0bca231dd38d359c061a4227c778c0 /spec/services/merge_requests/merge_service_spec.rb | |
| parent | d0c0c75ca9568bc3ec00c341a6053623d85e6201 (diff) | |
| download | gitlab-ce-6df22f72c6c312199c547e017ce1f947cf88e34c.tar.gz | |
Rephrase some system notes to be compatible with new system note stylerephrase-system-notes
Diffstat (limited to 'spec/services/merge_requests/merge_service_spec.rb')
| -rw-r--r-- | spec/services/merge_requests/merge_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb index 7db32a33c93..dff1781d2aa 100644 --- a/spec/services/merge_requests/merge_service_spec.rb +++ b/spec/services/merge_requests/merge_service_spec.rb @@ -34,7 +34,7 @@ describe MergeRequests::MergeService, services: true do it 'creates system note about merge_request merge' do note = merge_request.notes.last - expect(note.note).to include 'Status changed to merged' + expect(note.note).to include 'merged' end end |