summaryrefslogtreecommitdiff
path: root/lib/gitlab/bitbucket_import
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-27 21:08:05 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-27 21:08:05 +0000
commit47579e24f3f9f29d5b8093f54e6958fefd7f2057 (patch)
treee8dedf16ceaa2143ce4e81906527a4670cb9916a /lib/gitlab/bitbucket_import
parent88ccc935c04ff0e015be60bac02853770b79d28d (diff)
downloadgitlab-ce-47579e24f3f9f29d5b8093f54e6958fefd7f2057.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/bitbucket_import')
-rw-r--r--lib/gitlab/bitbucket_import/importer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb
index d8f9105d66d..5a9fad3be56 100644
--- a/lib/gitlab/bitbucket_import/importer.rb
+++ b/lib/gitlab/bitbucket_import/importer.rb
@@ -43,7 +43,7 @@ module Gitlab
def store_pull_request_error(pull_request, ex)
backtrace = Gitlab::BacktraceCleaner.clean_backtrace(ex.backtrace)
- error = { type: :pull_request, iid: pull_request.iid, errors: ex.message, trace: backtrace, raw_response: pull_request.raw }
+ error = { type: :pull_request, iid: pull_request.iid, errors: ex.message, trace: backtrace, raw_response: pull_request.raw&.to_json }
Gitlab::ErrorTracking.log_exception(ex, error)