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

Use the 'shared' directory for MR rebasing

See merge request !62
This commit is contained in:
Robert Speicher
2015-11-27 19:49:41 +00:00
+1 -1
View File
@@ -539,7 +539,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?