diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-21 11:27:28 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-21 11:27:28 +0100 |
| commit | c6a4f9fc5b98024d4af872b0009b90c36bc2e595 (patch) | |
| tree | c945102da813fb098bdbdaeb65bd6fc5cb69b72e /app/services/system_note_service.rb | |
| parent | d07ef089c8870b4a5a1c69555c54c93ff1f1fa24 (diff) | |
| download | gitlab-ce-c6a4f9fc5b98024d4af872b0009b90c36bc2e595.tar.gz | |
Update some docs to reflect MWPS name change
Diffstat (limited to 'app/services/system_note_service.rb')
| -rw-r--r-- | app/services/system_note_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb index 925e4938784..5bf6e094d68 100644 --- a/app/services/system_note_service.rb +++ b/app/services/system_note_service.rb @@ -133,14 +133,14 @@ module SystemNoteService create_note(noteable: noteable, project: project, author: author, note: body) end - # Called when 'merge when build succeeds' is executed + # Called when 'merge when pipeline succeeds' is executed def merge_when_build_succeeds(noteable, project, author, last_commit) body = "Enabled an automatic merge when the pipeline for #{last_commit.to_reference(project)} succeeds" create_note(noteable: noteable, project: project, author: author, note: body) end - # Called when 'merge when build succeeds' is canceled + # Called when 'merge when pipeline succeeds' is canceled def cancel_merge_when_build_succeeds(noteable, project, author) body = 'Canceled the automatic merge' |