mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-23 19:46:12 +10:00
Merge branch 'rebase-use-shared' into 'master'
Use the 'shared' directory for MR rebasing See merge request !62
This commit is contained in:
@@ -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?
|
||||
|
||||
Reference in New Issue
Block a user