diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-03 12:27:34 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-05 17:42:38 +0300 |
| commit | 2462a96e459c95f987f39e3c380de7c7cc350cfd (patch) | |
| tree | 065157ddb9e707a911bc38c878662bfaf0cca3c2 /app/services/system_note_service.rb | |
| parent | 25907ebe476a24bfdd2c451f18227d4fcf314b07 (diff) | |
Incorporate feedback
Diffstat (limited to 'app/services/system_note_service.rb')
| -rw-r--r-- | app/services/system_note_service.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb index ed557fef814..f84e480ca9c 100644 --- a/app/services/system_note_service.rb +++ b/app/services/system_note_service.rb @@ -131,15 +131,15 @@ class SystemNoteService end # Called when 'merge when build succeeds' is executed - def self.merge_when_build_succeeds(noteable, project, author, ci_commit) - body = "Enabled an automatic merge when the build for #{ci_commit.sha} succeeds" + def self.merge_when_build_succeeds(noteable, project, author, last_commit) + body = "Enabled an automatic merge when the build for #{last_commit.to_reference} succeeds" create_note(noteable: noteable, project: project, author: author, note: body) end # Called when 'merge when build succeeds' is canceled def self.cancel_merge_when_build_succeeds(noteable, project, author) - body = "Canceled the automatic merge" + body = "Cancelled the automatic merge" create_note(noteable: noteable, project: project, author: author, note: body) end |