diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-07 11:59:04 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-07 11:59:16 +0300 |
| commit | 46278ec7ba7c618acaf7381ad466742ce84e33db (patch) | |
| tree | e82a268ed6047be3ae43f8c075a9b767488a4a95 /app/services/system_note_service.rb | |
| parent | 2462a96e459c95f987f39e3c380de7c7cc350cfd (diff) | |
Button fix
Diffstat (limited to 'app/services/system_note_service.rb')
| -rw-r--r-- | app/services/system_note_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb index f84e480ca9c..6d15a49145d 100644 --- a/app/services/system_note_service.rb +++ b/app/services/system_note_service.rb @@ -139,7 +139,7 @@ class SystemNoteService # Called when 'merge when build succeeds' is canceled def self.cancel_merge_when_build_succeeds(noteable, project, author) - body = "Cancelled the automatic merge" + body = "Canceled the automatic merge" create_note(noteable: noteable, project: project, author: author, note: body) end |