diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-11-21 22:06:09 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-11-21 22:06:09 -0800 |
| commit | 7a155137a4fd965cb8ff512a9548a7e685b330f5 (patch) | |
| tree | 3789cb5cfa282bcbcc97baaa8ed61acaae160440 /lib/gitlab/bitbucket_import | |
| parent | fc40c3f28a67ecafa58191c0cd6065960dd59c7d (diff) | |
| download | gitlab-ce-7a155137a4fd965cb8ff512a9548a7e685b330f5.tar.gz | |
Fix spec for Bitbucket importer
Diffstat (limited to 'lib/gitlab/bitbucket_import')
| -rw-r--r-- | lib/gitlab/bitbucket_import/importer.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb index 729b465e861..08705afcabb 100644 --- a/lib/gitlab/bitbucket_import/importer.rb +++ b/lib/gitlab/bitbucket_import/importer.rb @@ -94,7 +94,7 @@ module Gitlab import_pull_request_comments(pull_request, merge_request) if merge_request.persisted? rescue ActiveRecord::RecordInvalid - nil + Rails.log.error("Bitbucket importer ERROR in #{project.path_with_namespace}: Invalid pull request #{e.message}") end end end @@ -134,7 +134,7 @@ module Gitlab merge_request.notes.create!(attributes) rescue ActiveRecord::RecordInvalid => e - Rails.log.error("Bitbucket importer ERROR: Invalid pull request comment #{e.message}") + Rails.log.error("Bitbucket importer ERROR in #{project.path_with_namespace}: Invalid pull request comment #{e.message}") nil end end @@ -145,7 +145,7 @@ module Gitlab begin merge_request.notes.create!(pull_request_comment_attributes(comment)) rescue ActiveRecord::RecordInvalid => e - Rails.log.error("Bitbucket importer ERROR: Invalid standalone pull request comment #{e.message}") + Rails.log.error("Bitbucket importer ERROR in #{project.path_with_namespace}: Invalid standalone pull request comment #{e.message}") nil end end |