summaryrefslogtreecommitdiff
path: root/lib/gitlab/bitbucket_server_import
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-20 12:09:02 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-20 12:09:02 +0000
commit98252e0dd60cbcb316231085e206d9872f243b8a (patch)
tree304021f4190aabcc74f1359866c0efff84995729 /lib/gitlab/bitbucket_server_import
parent2ee5991b42717969af93cb30d863aafab04dff8a (diff)
downloadgitlab-ce-98252e0dd60cbcb316231085e206d9872f243b8a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/bitbucket_server_import')
-rw-r--r--lib/gitlab/bitbucket_server_import/importer.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/bitbucket_server_import/importer.rb b/lib/gitlab/bitbucket_server_import/importer.rb
index 886fbaaff48..16fe5b46b1f 100644
--- a/lib/gitlab/bitbucket_server_import/importer.rb
+++ b/lib/gitlab/bitbucket_server_import/importer.rb
@@ -172,6 +172,7 @@ module Gitlab
stage: 'import_pull_requests', iid: pull_request.iid, error: e.message
)
+ backtrace = Gitlab::BacktraceCleaner.clean_backtrace(e.backtrace)
errors << { type: :pull_request, iid: pull_request.iid, errors: e.message, backtrace: backtrace.join("\n"), raw_response: pull_request.raw }
end
end