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

lib/gitlab/import_export.rb

@@ -23,5 +23,9 @@ module Gitlab
     def version_filename
       'VERSION'
     end
+
+    def version
+      VERSION
+    end
   end
 end

lib/gitlab/import_export/project_tree_saver.rb

@@ -10,7 +10,6 @@ module Gitlab
       end
 
       def save
-        FileUtils.mkdir_p(@shared.export_path)
         File.write(full_path, project_json_tree)
         true
       rescue => e

lib/gitlab/import_export/version_restorer.rb

@@ -25,8 +25,8 @@ module Gitlab
       end
 
       def verify_version!(version)
-        if Gem::Version.new(version) > Gem::Version.new(Gitlab::ImportExport.VERSION)
-          raise Gitlab::ImportExport::Error("Import version mismatch: Required <= #{Gitlab::ImportExport.VERSION} but was #{version}")
+        if Gem::Version.new(version) > Gem::Version.new(Gitlab::ImportExport.version)
+          raise Gitlab::ImportExport::Error("Import version mismatch: Required <= #{Gitlab::ImportExport.version} but was #{version}")
         else
           true
         end

lib/gitlab/import_export/version_saver.rb

@@ -11,8 +11,10 @@ module Gitlab
       end
 
       def save
+        FileUtils.mkdir_p(@shared.export_path)
+
         File.open(version_file, 'w') do |file|
-          file.write(Gitlab::ImportExport.VERSION)
+          file.write(Gitlab::ImportExport.version)
         end
       rescue => e
         @shared.error(e)