diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-10 15:48:03 +0300 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-10-13 15:36:27 +0300 |
commit | 946635c262ecc0b3cc16c858ca24f60ff3fbc357 (patch) | |
tree | 14a62796879f4cf421f7044b8d855bba5265fb45 /app | |
parent | d9088c147f86d40eff0cddb51bcb7dad8c522aee (diff) |
Merge branch '38941-lock-note-fix' into 'master'
Fix text for the merge request lock system note
Closes #38941
See merge request gitlab-org/gitlab-ce!14779
Diffstat (limited to 'app')
-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 7b32e215c7f..a52dce6cb4b 100644 --- a/app/services/system_note_service.rb +++ b/app/services/system_note_service.rb @@ -593,7 +593,7 @@ module SystemNoteService def discussion_lock(issuable, author) action = issuable.discussion_locked? ? 'locked' : 'unlocked' - body = "#{action} this issue" + body = "#{action} this #{issuable.class.to_s.titleize.downcase}" create_note(NoteSummary.new(issuable, issuable.project, author, body, action: action)) end |