Rubocop fixes

This commit is contained in:
Stan Hu 2016-11-17 20:16:22 -08:00
parent f25d64d41a
commit b8bf28348f
2 changed files with 2 additions and 2 deletions

View file

@ -29,7 +29,7 @@ module Bitbucket
end end
def representation_class(type) def representation_class(type)
class_name = Bitbucket::Representation.const_get(type.to_s.camelize) Bitbucket::Representation.const_get(type.to_s.camelize)
end end
end end
end end

View file

@ -139,7 +139,7 @@ module Gitlab
line_code: line_code_map.fetch(comment.iid), line_code: line_code_map.fetch(comment.iid),
type: 'LegacyDiffNote') type: 'LegacyDiffNote')
note = merge_request.notes.create!(attributes) merge_request.notes.create!(attributes)
rescue ActiveRecord::RecordInvalid => e rescue ActiveRecord::RecordInvalid => e
Rails.log.error("Bitbucket importer ERROR: Invalid pull request comment #{e.message}") Rails.log.error("Bitbucket importer ERROR: Invalid pull request comment #{e.message}")
nil nil