diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 18:08:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 18:08:51 +0300 |
commit | 163a7046ac76eb4109184e82ce0af911633e6626 (patch) | |
tree | 9f22bb438db435d518e8f5520b309c6319ae0bd8 /app/models | |
parent | 0637ba1e6e9024f35b2cbf561d9002ec17350bb3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/project_services/jira_service.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb index 9875e0b9b88..028cd1ecce0 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -229,7 +229,15 @@ class JiraService < IssueTrackerService jira_issue_transition_id.scan(Gitlab::Regex.jira_transition_id_regex).each do |transition_id| issue.transitions.build.save!(transition: { id: transition_id }) rescue => error - log_error("Issue transition failed", error: error.message, client_url: client_url) + log_error( + "Issue transition failed", + error: { + exception_class: error.class.name, + exception_message: error.message, + exception_backtrace: Gitlab::BacktraceCleaner.clean_backtrace(error.backtrace) + }, + client_url: client_url + ) return false end end @@ -354,7 +362,7 @@ class JiraService < IssueTrackerService error: { exception_class: error.class.name, exception_message: error.message, - exception_backtrace: error.backtrace.join("\n") + exception_backtrace: Gitlab::BacktraceCleaner.clean_backtrace(error.backtrace) } ) nil |