Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJason Goodman <jgoodman@gitlab.com>2019-05-02 19:07:26 +0300
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-05-02 19:07:26 +0300
commit1b8646804d323d1a919c0150511168f8b6ef41d1 (patch)
treee566308e3b8dc3b19b62c1be2c239ee00d3e04af /app
parentf1526ccd5859f29bf054202a53a371e25c1dcb10 (diff)
Update deployment chat message notification
Include link to user and commit title. Rearrange text
Diffstat (limited to 'app')
-rw-r--r--app/models/project_services/chat_message/deployment_message.rb12
1 files changed, 10 insertions, 2 deletions
diff --git a/app/models/project_services/chat_message/deployment_message.rb b/app/models/project_services/chat_message/deployment_message.rb
index 656a3e6ab4b..dae3a56116e 100644
--- a/app/models/project_services/chat_message/deployment_message.rb
+++ b/app/models/project_services/chat_message/deployment_message.rb
@@ -2,27 +2,31 @@
module ChatMessage
class DeploymentMessage < BaseMessage
+ attr_reader :commit_title
attr_reader :commit_url
attr_reader :deployable_id
attr_reader :deployable_url
attr_reader :environment
attr_reader :short_sha
attr_reader :status
+ attr_reader :user_url
def initialize(data)
super
+ @commit_title = data[:commit_title]
@commit_url = data[:commit_url]
@deployable_id = data[:deployable_id]
@deployable_url = data[:deployable_url]
@environment = data[:environment]
@short_sha = data[:short_sha]
@status = data[:status]
+ @user_url = data[:user_url]
end
def attachments
[{
- text: "#{project_link}\n#{deployment_link}, SHA #{commit_link}, by #{user_combined_name}",
+ text: "#{project_link} with job #{deployment_link} by #{user_link}\n#{commit_link}: #{commit_title}",
color: color
}]
end
@@ -55,7 +59,11 @@ module ChatMessage
end
def deployment_link
- link("Job ##{deployable_id}", deployable_url)
+ link("##{deployable_id}", deployable_url)
+ end
+
+ def user_link
+ link(user_combined_name, user_url)
end
def commit_link