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

Remove date from author line since that is already present in `created_at`

This commit is contained in:
Stan Hu 2018-08-03 06:07:37 -07:00
parent 61f5c2e38c
commit d8ce4f942b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gitlab/bitbucket_server_import/importer.rb
View File

@ -303,7 +303,7 @@ module Gitlab
unless author
author = project.creator_id
note = "*By #{comment.author_username} (#{comment.author_email}) on #{comment.created_at}*\n\n"
note = "*By #{comment.author_username} (#{comment.author_email})*\n\n"
end
note +=

2
spec/lib/gitlab/bitbucket_server_import/importer_spec.rb
View File

@ -169,7 +169,7 @@ describe Gitlab::BitbucketServerImport::Importer do
reply_note = notes.last
# Make sure author and reply context is included
expect(reply_note.note).to start_with("*By #{reply.author_username} (#{reply.author_email}) on #{reply.created_at}*\n\n")
expect(reply_note.note).to start_with("*By #{reply.author_username} (#{reply.author_email})*\n\n")
expect(reply_note.note).to end_with("> #{inline_note.note}\n\n#{reply.note}")
expect(reply_note.author).to eq(project.owner)
expect(reply_note.created_at).to eq(reply.created_at)