kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'revert-6f85eb38' into 'master'

Browse source 
Revert "Merge branch 'issue_5854' into 'master'"

This reverts merge request !2992

cc @rdavila 

See merge request !3013
This commit is contained in:
Dmitriy Zaporozhets 2016-02-29 18:00:09 +00:00
commit 333ad73e76
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/project_services/jira_service.rb
View file

@ -108,8 +108,7 @@ class JiraService < IssueTrackerService
},
entity: {
name: noteable_name.humanize.downcase,
url: entity_url,
title: noteable.title
url: entity_url
}
}
@ -197,11 +196,10 @@ class JiraService < IssueTrackerService
user_url = data[:user][:url]
entity_name = data[:entity][:name]
entity_url = data[:entity][:url]
entity_title = data[:entity][:title]
project_name = data[:project][:name]
message = {
body: %Q{[#{user_name}|#{user_url}] mentioned this issue in [a #{entity_name} of #{project_name}|#{entity_url}]:\n"#{entity_title}"}
body: "[#{user_name}|#{user_url}] mentioned this issue in [a #{entity_name} of #{project_name}|#{entity_url}]."
}
unless existing_comment?(issue_name, message[:body])