diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-08-03 16:07:37 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-08-03 16:07:37 +0300 |
| commit | d8ce4f942bd8005a7eb7beb8f5f9e812e5a7e763 (patch) | |
| tree | 17f075bf8cd71f898576c16a3ed4ac0f795b2dee | |
| parent | 61f5c2e38c9699f9ce9307997b2b0f4ca44205f6 (diff) | |
Remove date from author line since that is already present in `created_at`
| -rw-r--r-- | lib/gitlab/bitbucket_server_import/importer.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/bitbucket_server_import/importer_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/bitbucket_server_import/importer.rb b/lib/gitlab/bitbucket_server_import/importer.rb index c67797501c6..268d21a77d1 100644 --- a/lib/gitlab/bitbucket_server_import/importer.rb +++ b/lib/gitlab/bitbucket_server_import/importer.rb @@ -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 += diff --git a/spec/lib/gitlab/bitbucket_server_import/importer_spec.rb b/spec/lib/gitlab/bitbucket_server_import/importer_spec.rb index ad71606591c..70423823b89 100644 --- a/spec/lib/gitlab/bitbucket_server_import/importer_spec.rb +++ b/spec/lib/gitlab/bitbucket_server_import/importer_spec.rb @@ -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) |