Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
dfebcb89
Commit
dfebcb89
authored
Apr 17, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't save unchanged user map items to the DB.
parent
5456b00f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
0 deletions
+5
-0
app/controllers/import/google_code_controller.rb
app/controllers/import/google_code_controller.rb
+5
-0
No files found.
app/controllers/import/google_code_controller.rb
View file @
dfebcb89
...
@@ -54,6 +54,11 @@ class Import::GoogleCodeController < Import::BaseController
...
@@ -54,6 +54,11 @@ class Import::GoogleCodeController < Import::BaseController
render
"new_user_map"
and
return
render
"new_user_map"
and
return
end
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
session
[
:google_code_user_map
]
=
user_map
flash
[
:notice
]
=
"The user map has been saved. Continue by selecting the projects you want to import."
flash
[
:notice
]
=
"The user map has been saved. Continue by selecting the projects you want to import."
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment