Automatic merge of gitlab-org/gitlab-ce master

.gitlab/issue_templates/Test plan.md

@@ -93,4 +93,4 @@ When adding new automated tests, please keep [testing levels](https://docs.gitla
 in mind.
 -->
 
-/label ~Quality ~"test plan"
+/label ~Quality ~"test\-plan"

lib/backup/uploads.rb

@@ -9,7 +9,7 @@ module Backup
     def initialize(progress)
       @progress = progress
 
-      super('uploads', Rails.root.join('public/uploads'))
+      super('uploads', File.join(Gitlab.config.uploads.storage_path, "uploads"))
     end
   end
 end

spec/lib/backup/uploads_spec.rb

+require 'spec_helper'
+
+describe Backup::Uploads do
+  let(:progress) { StringIO.new }
+  subject(:backup) { described_class.new(progress) }
+
+  describe '#initialize' do
+    it 'uses the correct upload dir' do
+      Dir.mktmpdir do |tmpdir|
+        FileUtils.mkdir_p("#{tmpdir}/uploads")
+
+        allow(Gitlab.config.uploads).to receive(:storage_path) { tmpdir }
+
+        expect(backup.app_files_dir).to eq("#{tmpdir}/uploads")
+      end
+    end
+  end
+end

spec/tasks/gitlab/backup_rake_spec.rb

@@ -21,9 +21,6 @@ describe 'gitlab:app namespace rake task' do
 
     # empty task as env is already loaded
     Rake::Task.define_task :environment
-
-    # We need this directory to run `gitlab:backup:create` task
-    FileUtils.mkdir_p('public/uploads')
   end
 
   before do
@@ -38,6 +35,7 @@ describe 'gitlab:app namespace rake task' do
   end
 
   def run_rake_task(task_name)
+    FileUtils.mkdir_p('tmp/tests/public/uploads')
     Rake::Task[task_name].reenable
     Rake.application.invoke_task task_name
   end