2 files changed, 12 insertions, 8 deletions
diff --git a/app/models/project_services/chat_message/deployment_message.rb b/app/models/project_services/chat_message/deployment_message.rb
index dae3a56116e..5deb757e60f 100644
--- a/app/models/project_services/chat_message/deployment_message.rb
+++ b/app/models/project_services/chat_message/deployment_message.rb
@@ -38,7 +38,11 @@ module ChatMessage
     private
 
     def message
-      "Deploy to #{environment} #{humanized_status}"
+      if running?
+        "Starting deploy to #{environment}"
+      else
+        "Deploy to #{environment} #{humanized_status}"
+      end
     end
 
     def color
@@ -73,5 +77,9 @@ module ChatMessage
     def humanized_status
       status == 'success' ? 'succeeded' : status
     end
+
+    def running?
+      status == 'running'
+    end
   end
 end
diff --git a/app/models/project_services/chat_message/issue_message.rb b/app/models/project_services/chat_message/issue_message.rb
index 0cdcfcf0237..c8e90b66bae 100644
--- a/app/models/project_services/chat_message/issue_message.rb
+++ b/app/models/project_services/chat_message/issue_message.rb
@@ -41,15 +41,11 @@ module ChatMessage
     private
 
     def message
-      if opened_issue?
-        "[#{project_link}] Issue #{state} by #{user_combined_name}"
-      else
-        "[#{project_link}] Issue #{issue_link} #{state} by #{user_combined_name}"
-      end
+      "[#{project_link}] Issue #{issue_link} #{state} by #{user_combined_name}"
     end
 
     def opened_issue?
-      action == "open"
+      action == 'open'
     end
 
     def description_message
@@ -57,7 +53,7 @@ module ChatMessage
         title: issue_title,
         title_link: issue_url,
         text: format(description),
-        color: "#C95823"
+        color: '#C95823'
       }]
     end