diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-21 10:32:48 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-21 10:32:48 +0200 |
| commit | 1c30f775995378082942f4c7c8c2f7bdc11e48a9 (patch) | |
| tree | de6d5676ace77d022ab8e3c85e9d27a8f0a9b418 /lib/gitlab/google_code_import | |
| parent | 18f80c55600e485c87d23afccd82b4947e27ff17 (diff) | |
| download | gitlab-ce-1c30f775995378082942f4c7c8c2f7bdc11e48a9.tar.gz | |
Don't autolink masked imported email addresses.
Diffstat (limited to 'lib/gitlab/google_code_import')
| -rw-r--r-- | lib/gitlab/google_code_import/importer.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/gitlab/google_code_import/importer.rb b/lib/gitlab/google_code_import/importer.rb index 532689bca6c..70bfe059776 100644 --- a/lib/gitlab/google_code_import/importer.rb +++ b/lib/gitlab/google_code_import/importer.rb @@ -30,7 +30,10 @@ module Gitlab def user_map @user_map ||= begin - user_map = Hash.new { |hash, user| Client.mask_email(user) } + user_map = Hash.new do |hash, user| + # Replace ... by \.\.\., so `johnsm...@gmail.com` isn't autolinked. + Client.mask_email(user).sub("...", "\\.\\.\\.") + end import_data = project.import_data.try(:data) stored_user_map = import_data["user_map"] if import_data |