From b895a2e3b057624ebcf948b239602f0e1cb88b7f Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 24 Nov 2015 14:22:23 +0100 Subject: [PATCH] Use the 'shared' directory for MR rebasing --- app/models/merge_request.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 524e8bf6f8..de6d70aec3 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -537,7 +537,7 @@ class MergeRequest < ActiveRecord::Base end def rebase_dir_path - Rails.root.join('tmp', 'rebase', source_project.id.to_s, id.to_s).to_s + File.join(Gitlab.config.shared.path, 'tmp/rebase', source_project.id.to_s, id.to_s).to_s end def rebase_in_progress?