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

4 files changed, 4 insertions, 5 deletions

diff --git a/lib/gitlab/import_export/project_tree_saver.rb b/lib/gitlab/import_export/project_tree_saver.rb
index e4674b6cd0b..9153088e966 100644
--- a/lib/gitlab/import_export/project_tree_saver.rb
+++ b/lib/gitlab/import_export/project_tree_saver.rb
@@ -22,7 +22,7 @@ module Gitlab
       private
 
       def project_json_tree
-        @project.to_json(Gitlab::ImportExport::ImportExportReader.new(shared: @shared).project_tree)
+        @project.to_json(Gitlab::ImportExport::Reader.new(shared: @shared).project_tree)
       end
     end
   end
diff --git a/lib/gitlab/import_export/import_export_reader.rb b/lib/gitlab/import_export/reader.rb
index 25253330745..19defd8f03a 100644
--- a/lib/gitlab/import_export/import_export_reader.rb
+++ b/lib/gitlab/import_export/reader.rb
@@ -1,6 +1,6 @@
 module Gitlab
   module ImportExport
-    class ImportExportReader
+    class Reader
 
       attr_reader :tree
 
diff --git a/lib/gitlab/import_export/repo_saver.rb b/lib/gitlab/import_export/repo_saver.rb
index 07d71c78f33..cce43fe994b 100644
--- a/lib/gitlab/import_export/repo_saver.rb
+++ b/lib/gitlab/import_export/repo_saver.rb
@@ -12,6 +12,7 @@ module Gitlab
 
       def save
         return false if @project.empty_repo?
+
         @full_path = File.join(@shared.export_path, ImportExport.project_bundle_filename)
         bundle_to_disk
       end
diff --git a/lib/gitlab/import_export/version_saver.rb b/lib/gitlab/import_export/version_saver.rb
index fe02a2a6d76..f7f73dc9343 100644
--- a/lib/gitlab/import_export/version_saver.rb
+++ b/lib/gitlab/import_export/version_saver.rb
@@ -9,9 +9,7 @@ module Gitlab
       def save
         FileUtils.mkdir_p(@shared.export_path)
 
-        File.open(version_file, 'w') do |file|
-          file.write(Gitlab::ImportExport.version)
-        end
+        File.write(version_file, Gitlab::ImportExport.version, mode: 'w')
       rescue => e
         @shared.error(e)
         false