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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
d607046d
Commit
d607046d
authored
May 10, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Plain Diff
fix merge conflicts
parents
47cd14b5
6a12ff63
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
9 deletions
+5
-9
lib/gitlab/import_export.rb
lib/gitlab/import_export.rb
+0
-4
lib/gitlab/import_export/attributes_finder.rb
lib/gitlab/import_export/attributes_finder.rb
+1
-0
lib/gitlab/import_export/import_export.yml
lib/gitlab/import_export/import_export.yml
+0
-1
lib/gitlab/import_export/import_export_reader.rb
lib/gitlab/import_export/import_export_reader.rb
+4
-4
No files found.
lib/gitlab/import_export.rb
View file @
d607046d
...
...
@@ -6,10 +6,6 @@ module Gitlab
File
.
join
(
storage_path
,
relative_path
)
end
def
project_attributes
%i(name path description issues_enabled wall_enabled merge_requests_enabled wiki_enabled snippets_enabled visibility_level archived)
end
def
project_tree_list
project_tree
.
map
{
|
r
|
r
.
is_a?
(
Hash
)
?
r
.
keys
.
first
:
r
}
end
...
...
lib/gitlab/import_export/attributes_finder.rb
View file @
d607046d
module
Gitlab
module
ImportExport
class
AttributesFinder
def
initialize
(
included_attributes
:,
excluded_attributes
:)
@included_attributes
=
included_attributes
||
{}
@excluded_attributes
=
excluded_attributes
||
{}
...
...
lib/gitlab/import_export/import_export.yml
View file @
d607046d
...
...
@@ -22,7 +22,6 @@ included_attributes:
-
:path
-
:description
-
:issues_enabled
-
:wall_enabled
-
:merge_requests_enabled
-
:wiki_enabled
-
:snippets_enabled
...
...
lib/gitlab/import_export/import_export_reader.rb
View file @
d607046d
...
...
@@ -17,11 +17,11 @@ module Gitlab
private
def
build_hash
(
model_list
)
model_list
.
map
do
|
model_object
_hash
|
if
model_object
_hash
.
is_a?
(
Hash
)
build_json_config_hash
(
model_object
_hash
)
model_list
.
map
do
|
model_object
s
|
if
model_object
s
.
is_a?
(
Hash
)
build_json_config_hash
(
model_object
s
)
else
@attributes_parser
.
find
(
model_object
_hash
)
@attributes_parser
.
find
(
model_object
s
)
end
end
end
...
...
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