Add latest changes from gitlab-org/gitlab@master

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