diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-07 09:59:04 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-07 09:59:16 +0100 |
| commit | 46278ec7ba7c618acaf7381ad466742ce84e33db (patch) | |
| tree | e82a268ed6047be3ae43f8c075a9b767488a4a95 /spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb | |
| parent | 2462a96e459c95f987f39e3c380de7c7cc350cfd (diff) | |
| download | gitlab-ce-46278ec7ba7c618acaf7381ad466742ce84e33db.tar.gz | |
Button fix
Diffstat (limited to 'spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb')
| -rw-r--r-- | spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb index a62d88cde86..188fda6211f 100644 --- a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb +++ b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb @@ -78,7 +78,7 @@ describe MergeRequests::MergeWhenBuildSucceedsService do it 'Posts a system note' do note = mr_merge_if_green_enabled.notes.last - expect(note.note).to include 'Cancelled the automatic merge' + expect(note.note).to include 'Canceled the automatic merge' end end end |