Commit 437679ec authored by Robert Speicher's avatar Robert Speicher

Merge branch 'rebase-use-shared' into 'master'

Use the 'shared' directory for MR rebasing

See merge request !62
parents a9b86128 7827f99e
...@@ -539,7 +539,7 @@ class MergeRequest < ActiveRecord::Base ...@@ -539,7 +539,7 @@ class MergeRequest < ActiveRecord::Base
end end
def rebase_dir_path 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 end
def rebase_in_progress? def rebase_in_progress?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment