summaryrefslogtreecommitdiff
path: root/app/services/system_note_service.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/system_note_service.rb')
-rw-r--r--app/services/system_note_service.rb2
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