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

app/workers/project_import_worker.rb

@@ -11,15 +11,15 @@ class ProjectImportWorker
                                                           owner: current_user,
                                                           namespace_id: namespace_id,
                                                           project_path: path)
-
-    # TODO: Move this to import service
-    # if result[:status] == :error
-    #   project.update(import_error: result[:message])
-    #   project.import_fail
-    #   return
-    # end
-
+    if project
       project.repository.after_import
       project.import_finish
+    else
+      logger.error("There was an error during the import: #{tmpfile}")
+    end
+  end
+
+  def logger
+    Sidekiq.logger
   end
 end

lib/gitlab/import_export/import_service.rb

@@ -14,7 +14,8 @@ module Gitlab
       end
 
       def execute
-        Gitlab::ImportExport::Importer.import(archive_file: @archive_file, storage_path: storage_path)
+        Gitlab::ImportExport::Importer.import(archive_file: @archive_file,
+                                              storage_path: storage_path)
         project_tree.project if [restore_project_tree, restore_repo, restore_wiki_repo].all?
       end
 
@@ -25,15 +26,20 @@ module Gitlab
       end
 
       def project_tree
-        @project_tree ||= Gitlab::ImportExport::ProjectTreeRestorer.new(path: storage_path, user: @current_user, project_path: @project_path, namespace_id: @namespace.id)
+        @project_tree ||= Gitlab::ImportExport::ProjectTreeRestorer.new(path: storage_path,
+                                                                        user: @current_user,
+                                                                        project_path: @project_path,
+                                                                        namespace_id: @namespace.id)
       end
 
       def restore_repo
-        Gitlab::ImportExport::RepoRestorer.new(path_to_bundle: repo_path, project: project_tree.project).restore
+        Gitlab::ImportExport::RepoRestorer.new(path_to_bundle: repo_path,
+                                               project: project_tree.project).restore
       end
 
       def restore_wiki_repo
-        Gitlab::ImportExport::RepoRestorer.new(path_to_bundle: wiki_repo_path, project: ProjectWiki.new(project_tree.project)).restore
+        Gitlab::ImportExport::RepoRestorer.new(path_to_bundle: wiki_repo_path,
+                                               project: ProjectWiki.new(project_tree.project)).restore
       end
 
       def storage_path

lib/gitlab/import_export/project_tree_restorer.rb

@@ -14,6 +14,8 @@ module Gitlab
         @tree_hash = ActiveSupport::JSON.decode(json)
         @project_members = @tree_hash.delete('project_members')
         create_relations
+      rescue
+        false
       end
 
       def project
@@ -50,7 +52,7 @@ module Gitlab
           project_params: project_params, user: @user, namespace_id: @namespace_id)
         project.path = @project_path
         project.name = @project_path
-        project.save
+        project.save!
         project
       end