diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-10 12:48:03 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-10 12:48:03 +0000 |
commit | b71208531a492fa5e5266dba32e0a4949b29f51f (patch) | |
tree | e4e930ebc0aa1816760e588477264c3082e8f80e /app | |
parent | 9f1c9b3d9b2ea858943cdb45cc96b05f59bdb8aa (diff) | |
parent | 616d1e10717c40e1a4777378ee8e520e2e6595b8 (diff) | |
download | gitlab-ce-b71208531a492fa5e5266dba32e0a4949b29f51f.tar.gz |
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 |