From 891c2ea1ddb4ce6256fff772c9f7b3b8b860527f Mon Sep 17 00:00:00 2001 From: Drew Blessing Date: Tue, 3 Nov 2015 17:29:13 -0600 Subject: [PATCH] improve_jira_comment_text --- app/models/project_services/jira_service.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb index f6d5d65cd4e29f..a6b22d64161017 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -112,8 +112,9 @@ def create_cross_reference_note(mentioned, noteable, author) }, entity: { name: noteable_name.humanize.downcase, - url: entity_url - } + url: entity_url, + id: noteable_id + }, } add_comment(data, issue_name) @@ -170,7 +171,7 @@ def close_issue(commit, issue) update: { comment: [{ add: { - body: "Issue solved with [#{commit.id}|#{commit_url}]." + body: "Issue solved by commit [#{commit.id}|#{commit_url}]." } }] }, @@ -188,10 +189,12 @@ def add_comment(data, issue_name) user_url = data[:user][:url] entity_name = data[:entity][:name] entity_url = data[:entity][:url] + entity_id = data[:entity][:id] project_name = data[:project][:name] + project_url = data[:project][:url] message = { - body: "[#{user_name}|#{user_url}] mentioned this issue in [a #{entity_name} of #{project_name}|#{entity_url}]." + body: "[#{user_name}|#{user_url}] mentioned this issue in [#{entity_name} ##{entity_id}|#{entity_url}] of [#{project_name}|#{project_url}]." } unless existing_comment?(issue_name, message[:body]) -- GitLab