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

@@ -15,7 +15,7 @@ class ProjectImportWorker
       project.repository.after_import
       project.import_finish
     else
-      logger.error("There was an error during the import: #{tmpfile}")
+      logger.error("There was an error during the import: #{tmp_file}")
     end
   end
 

lib/gitlab/import_export/saver.rb

@@ -13,7 +13,7 @@ module Gitlab
 
       def save
         if compress_and_save
-          remove_@shared.storage_path
+          remove_storage_path
           Rails.logger.info("Saved project export #{archive_file}")
           archive_file
         else
@@ -30,7 +30,7 @@ module Gitlab
         tar_czf(archive: archive_file, dir: @shared.storage_path)
       end
 
-      def remove_shared.storage_path
+      def remove_storage_path
         FileUtils.rm_rf(@shared.storage_path)
       end