summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-02-29 18:00:09 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-02-29 18:00:09 +0000
commit333ad73e765d87fa1ccbd4a361f7f172c790f897 (patch)
tree0daf1bcd6b6ec7c50775b7a5631e79548107c7c0
parentedf5e9eb05ce4a3aa68740f5139dc333a4f887d4 (diff)
parente7364050b03593618da1e6a14784d63d6abc3849 (diff)
downloadgitlab-ce-333ad73e765d87fa1ccbd4a361f7f172c790f897.tar.gz
Merge branch 'revert-6f85eb38' into 'master'
Revert "Merge branch 'issue_5854' into 'master'" This reverts merge request !2992 cc @rdavila See merge request !3013
-rw-r--r--app/models/project_services/jira_service.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
index 65312ab3556..f6571fc063e 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -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])