Use the 'shared' directory for MR rebasing

b895a2e3 · Jacob Vosmaer · 1ab62227 · b895a2e3
Commit b895a2e3 authored Nov 24, 2015 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/models/merge_request.rb app/models/merge_request.rb +1 -1

No files found.
--- 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?