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
Léo-Paul Géneau
gitlab-ce
Commits
bf81c588
Commit
bf81c588
authored
8 years ago
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix issue with mapping members
parent
41f9d9d9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
lib/gitlab/import_export/command_line_util.rb
lib/gitlab/import_export/command_line_util.rb
+0
-6
lib/gitlab/import_export/members_mapper.rb
lib/gitlab/import_export/members_mapper.rb
+4
-0
No files found.
lib/gitlab/import_export/command_line_util.rb
View file @
bf81c588
...
@@ -19,12 +19,6 @@ module Gitlab
...
@@ -19,12 +19,6 @@ module Gitlab
private
private
def
git_unbundle
(
git_bin_path:
Gitlab
.
config
.
git
.
bin_path
,
repo_path
:,
bundle_path
:)
cmd
=
%W(
#{
git_bin_path
}
clone --bare
#{
bundle_path
}
#{
repo_path
}
)
_output
,
status
=
Gitlab
::
Popen
.
popen
(
cmd
)
status
.
zero?
end
def
tar_with_options
(
archive
:,
dir
:,
options
:)
def
tar_with_options
(
archive
:,
dir
:,
options
:)
execute
(
%W(tar -
#{
options
}
#{
archive
}
-C
#{
dir
}
.)
)
execute
(
%W(tar -
#{
options
}
#{
archive
}
-C
#{
dir
}
.)
)
end
end
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/import_export/members_mapper.rb
View file @
bf81c588
...
@@ -10,6 +10,10 @@ module Gitlab
...
@@ -10,6 +10,10 @@ module Gitlab
@project
=
project
@project
=
project
@note_member_list
=
[]
@note_member_list
=
[]
# This needs to run first, as second call would be from generate_map
# which means project members already exist.
default_project_member
@project_member_map
=
Hash
.
new
do
|
_
,
key
|
@project_member_map
=
Hash
.
new
do
|
_
,
key
|
@note_member_list
<<
key
@note_member_list
<<
key
default_project_member
default_project_member
...
...
This diff is collapsed.
Click to expand it.
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