From 360689bb5834cfe5b57c121d71a5123f27081fb0 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Mon, 16 May 2016 13:11:49 +0200
Subject: [PATCH 1/2] fix version

---
 lib/gitlab/import_export/version_restorer.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/gitlab/import_export/version_restorer.rb b/lib/gitlab/import_export/version_restorer.rb
index bab2fecec4..2c83bf0899 100644
--- a/lib/gitlab/import_export/version_restorer.rb
+++ b/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

From 504c186f7139df71dbea596b422d833f32348f46 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Mon, 16 May 2016 13:28:11 +0200
Subject: [PATCH 2/2] fix version issue

---
 lib/gitlab/import_export.rb                    | 4 ++++
 lib/gitlab/import_export/project_tree_saver.rb | 1 -
 lib/gitlab/import_export/version_saver.rb      | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/gitlab/import_export.rb b/lib/gitlab/import_export.rb
index 9c7c72e2b4..65a8fcfadd 100644
--- a/lib/gitlab/import_export.rb
+++ b/lib/gitlab/import_export.rb
@@ -23,5 +23,9 @@ module Gitlab
     def version_filename
       'VERSION'
     end
+
+    def version
+      VERSION
+    end
   end
 end
diff --git a/lib/gitlab/import_export/project_tree_saver.rb b/lib/gitlab/import_export/project_tree_saver.rb
index c894295b0f..631746a47f 100644
--- a/lib/gitlab/import_export/project_tree_saver.rb
+++ b/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
diff --git a/lib/gitlab/import_export/version_saver.rb b/lib/gitlab/import_export/version_saver.rb
index e8be52b990..904645f273 100644
--- a/lib/gitlab/import_export/version_saver.rb
+++ b/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.message)