kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix failing spec in fallback diff note change

Browse source
This commit is contained in:
Stan Hu 2018-07-31 15:38:14 -07:00
parent 980ac50b27
commit db4ff688da
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/gitlab/bitbucket_server_import/importer.rb
View file

@ -261,11 +261,11 @@ module Gitlab
def create_fallback_diff_note(merge_request, comment, position)
attributes = pull_request_comment_attributes(comment)
note = "*Comment on "
note = "*Comment on"
note += " #{position.old_path}:#{position.old_line} -->" if position.old_line
note += " #{position.new_path}:#{position.new_line}" if position.new_line
new += "*\n\n#{comment.note}"
note += "*\n\n#{comment.note}"
attributes[:note] = note
merge_request.notes.create!(attributes)

3
spec/lib/gitlab/bitbucket_server_import/importer_spec.rb
View file

@ -221,9 +221,6 @@ describe Gitlab::BitbucketServerImport::Importer do
expect(notes.first.note).to start_with('*Comment on .gitmodules')
expect(notes.second.note).to start_with('*Comment on .gitmodules')
end
it 'restores branches of inaccessible SHAs' do
end
end
describe 'inaccessible branches' do