summaryrefslogtreecommitdiff
path: root/app/controllers/import
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-17 13:32:29 +0200
committerDouwe Maan <douwe@gitlab.com>2015-04-17 13:32:29 +0200
commitdfebcb89e64d2e4b3ebd2d69b6ae386b6fcc5be0 (patch)
tree8bae183e9d3259f7b795a009d145336702a61388 /app/controllers/import
parent5456b00f27d631fb58e230a75cfe84c7daf4e207 (diff)
downloadgitlab-ce-dfebcb89e64d2e4b3ebd2d69b6ae386b6fcc5be0.tar.gz
Don't save unchanged user map items to the DB.
Diffstat (limited to 'app/controllers/import')
-rw-r--r--app/controllers/import/google_code_controller.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/import/google_code_controller.rb b/app/controllers/import/google_code_controller.rb
index fb4ef987367..73c912e285b 100644
--- a/app/controllers/import/google_code_controller.rb
+++ b/app/controllers/import/google_code_controller.rb
@@ -54,6 +54,11 @@ class Import::GoogleCodeController < Import::BaseController
render "new_user_map" and return
end
+ # This is the default, so let's not save it into the database.
+ user_map.reject! do |key, value|
+ value == Gitlab::GoogleCodeImport::Client.mask_email(key)
+ end
+
session[:google_code_user_map] = user_map
flash[:notice] = "The user map has been saved. Continue by selecting the projects you want to import."