Split status and confidentiality action

1 files changed, 11 insertions, 3 deletions

diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index d3e502b66dd..35cfcc3682e 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -183,7 +183,9 @@ module SystemNoteService
     body = status.dup
     body << " via #{source.gfm_reference(project)}" if source
 
-    create_note(NoteSummary.new(noteable, project, author, body, action: 'status'))
+    action = status == 'reopened' ? 'opened' : status
+
+    create_note(NoteSummary.new(noteable, project, author, body, action: action))
   end
 
   # Called when 'merge when pipeline succeeds' is executed
@@ -273,9 +275,15 @@ module SystemNoteService
   #
   # Returns the created Note object
   def change_issue_confidentiality(issue, project, author)
-    body = issue.confidential ? 'made the issue confidential' : 'made the issue visible to everyone'
+    if issue.confidential
+      body = 'made the issue confidential'
+      action = 'confidential'
+    else
+      body = 'made the issue visible to everyone'
+      action = 'visible'
+    end
 
-    create_note(NoteSummary.new(issue, project, author, body, action: 'confidentiality'))
+    create_note(NoteSummary.new(issue, project, author, body, action: action))
   end
 
   # Called when a branch in Noteable is changed