diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 00:09:34 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 00:09:34 +0000 |
commit | 3cd08f4bf96cda3e9d3abf233095107832b17c20 (patch) | |
tree | dc09a618783a79d70f2a404374d4b850ccf9cc84 /app/models/project_services | |
parent | dd4bee69b7d55620f7dc9db8c36b478bd4959755 (diff) | |
download | gitlab-ce-3cd08f4bf96cda3e9d3abf233095107832b17c20.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/project_services')
-rw-r--r-- | app/models/project_services/jira_service.rb | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb index 028cd1ecce0..e3cd345d065 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -280,21 +280,17 @@ class JiraService < IssueTrackerService return unless client_url.present? jira_request do - create_issue_link(issue, remote_link_props) - create_issue_comment(issue, message) + remote_link = find_remote_link(issue, remote_link_props[:object][:url]) + + create_issue_comment(issue, message) unless remote_link + remote_link ||= issue.remotelink.build + remote_link.save!(remote_link_props) log_info("Successfully posted", client_url: client_url) "SUCCESS: Successfully posted to #{client_url}." end end - def create_issue_link(issue, remote_link_props) - remote_link = find_remote_link(issue, remote_link_props[:object][:url]) - remote_link ||= issue.remotelink.build - - remote_link.save!(remote_link_props) - end - def create_issue_comment(issue, message) return unless comment_on_event_enabled |