Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental

3 files changed, 3 insertions, 3 deletions

diff --git a/lib/gitlab/import_export/importer.rb b/lib/gitlab/import_export/importer.rb
index d73ce43b491..8020aab3da9 100644
--- a/lib/gitlab/import_export/importer.rb
+++ b/lib/gitlab/import_export/importer.rb
@@ -7,7 +7,7 @@ module Gitlab
         new(*args).import
       end
 
-      def initialize(archive_file: , shared:)
+      def initialize(archive_file:, shared:)
         @archive_file = archive_file
         @shared = shared
       end
diff --git a/lib/gitlab/import_export/project_tree_restorer.rb b/lib/gitlab/import_export/project_tree_restorer.rb
index dc1e477a82f..935bc2d7df9 100644
--- a/lib/gitlab/import_export/project_tree_restorer.rb
+++ b/lib/gitlab/import_export/project_tree_restorer.rb
@@ -73,7 +73,7 @@ module Gitlab
           relation.values.flatten.each do |sub_relation|
 
             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
             else
               relation_hash = relation_item[sub_relation.to_s]
diff --git a/lib/gitlab/import_export/repo_restorer.rb b/lib/gitlab/import_export/repo_restorer.rb
index d6dcf5dc116..ef4d9c24067 100644
--- a/lib/gitlab/import_export/repo_restorer.rb
+++ b/lib/gitlab/import_export/repo_restorer.rb
@@ -11,7 +11,7 @@ module Gitlab
       end
 
       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)