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
f3a7a3ec
Commit
f3a7a3ec
authored
Jun 13, 2016
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MergeRequest#commits.last is actually first_commit
Using a method would be less confusing.
parent
15191864
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 @
f3a7a3ec
...
...
@@ -610,7 +610,7 @@ class MergeRequest < ActiveRecord::Base
end
def
source_sha_parent
source_project
.
repository
.
commit
(
commits
.
las
t
.
sha
).
parents
.
first
.
sha
source_project
.
repository
.
commit
(
first_commi
t
.
sha
).
parents
.
first
.
sha
end
def
ff_merge_possible?
...
...
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