Commit c23aaf13 authored by James Lopez's avatar James Lopez

Merge branches 'feature/project-export-ui-experimental' and...

Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
parents d6adfe04 e5cf4cd7
...@@ -7,7 +7,7 @@ module Gitlab ...@@ -7,7 +7,7 @@ module Gitlab
new(*args).import new(*args).import
end end
def initialize(archive_file: , shared:) def initialize(archive_file:, shared:)
@archive_file = archive_file @archive_file = archive_file
@shared = shared @shared = shared
end end
......
...@@ -73,7 +73,7 @@ module Gitlab ...@@ -73,7 +73,7 @@ module Gitlab
relation.values.flatten.each do |sub_relation| relation.values.flatten.each do |sub_relation|
if sub_relation.is_a?(Hash) if sub_relation.is_a?(Hash)
relation_hash = relation_item[sub_relation.keys.first.to_s] relation_hash = relation_item[sub_relation.keys.first.to_s]
sub_relation = sub_relation.keys.first sub_relation = sub_relation.keys.first
else else
relation_hash = relation_item[sub_relation.to_s] relation_hash = relation_item[sub_relation.to_s]
......
...@@ -11,7 +11,7 @@ module Gitlab ...@@ -11,7 +11,7 @@ module Gitlab
end end
def restore def restore
return false unless File.exists?(@path_to_bundle) || wiki? return false unless File.exist?(@path_to_bundle) || wiki?
FileUtils.mkdir_p(path_to_repo) FileUtils.mkdir_p(path_to_repo)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment