BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
a181d675
Commit
a181d675
authored
Aug 31, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'remove-fishy-smell' into 'master'
Allow setting branch refs for MR @dbalexandre can you take a look please? See merge request !6025
parents
ee61c403
79fd7795
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
merge_request.rb
app/models/merge_request.rb
+2
-2
No files found.
app/models/merge_request.rb
View file @
a181d675
...
...
@@ -240,12 +240,12 @@ class MergeRequest < ActiveRecord::Base
def
source_branch_head
source_branch_ref
=
@source_branch_sha
||
source_branch
source_project
.
repository
.
commit
(
source_branch
)
if
source_branch_ref
source_project
.
repository
.
commit
(
source_branch
_ref
)
if
source_branch_ref
end
def
target_branch_head
target_branch_ref
=
@target_branch_sha
||
target_branch
target_project
.
repository
.
commit
(
target_branch
)
if
target_branch_ref
target_project
.
repository
.
commit
(
target_branch
_ref
)
if
target_branch_ref
end
def
branch_merge_base_commit
...
...
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