diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-07-03 16:44:32 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-07-03 16:44:32 -0700 |
| commit | ee22da98f0d310b341782e55331036cca9560ec5 (patch) | |
| tree | b6618bc0e9a79eca968f80b3d521656231842090 /lib/gitlab/bitbucket_server_import | |
| parent | d3c75ea4d916e0c81de2e8f7c5b1d748af9fa45e (diff) | |
| download | gitlab-ce-ee22da98f0d310b341782e55331036cca9560ec5.tar.gz | |
Assign merge event to ghost user if committer cannot be found
Diffstat (limited to 'lib/gitlab/bitbucket_server_import')
| -rw-r--r-- | lib/gitlab/bitbucket_server_import/importer.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/gitlab/bitbucket_server_import/importer.rb b/lib/gitlab/bitbucket_server_import/importer.rb index 2a33feb68a9..b451aa9d77c 100644 --- a/lib/gitlab/bitbucket_server_import/importer.rb +++ b/lib/gitlab/bitbucket_server_import/importer.rb @@ -164,6 +164,13 @@ module Gitlab return unless committer + user_id = + if committer + find_user_id(committer) + else + User.ghost + end + user_id = find_user_id(committer) if committer timestamp = merge_event.merge_timestamp |