Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
437679ec
Commit
437679ec
authored
Nov 27, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'rebase-use-shared' into 'master'
Use the 'shared' directory for MR rebasing See merge request !62
parents
a9b86128
7827f99e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/models/merge_request.rb
app/models/merge_request.rb
+1
-1
No files found.
app/models/merge_request.rb
View file @
437679ec
...
...
@@ -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?
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment