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
b6b90f06
Commit
b6b90f06
authored
Aug 30, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix using ancestor? rather than is_ancestor?
parent
c9331770
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/models/repository.rb
app/models/repository.rb
+1
-1
ee/app/models/ee/merge_request.rb
ee/app/models/ee/merge_request.rb
+1
-1
No files found.
app/models/repository.rb
View file @
b6b90f06
...
...
@@ -1018,7 +1018,7 @@ class Repository
upstream_commit
=
commit
(
"refs/remotes/
#{
MIRROR_REMOTE
}
/
#{
branch_name
}
"
)
if
upstream_commit
is_
ancestor?
(
branch_commit
.
id
,
upstream_commit
.
id
)
ancestor?
(
branch_commit
.
id
,
upstream_commit
.
id
)
else
false
end
...
...
ee/app/models/ee/merge_request.rb
View file @
b6b90f06
...
...
@@ -14,7 +14,7 @@ module EE
end
def
ff_merge_possible?
project
.
repository
.
is_
ancestor?
(
target_branch_sha
,
diff_head_sha
)
project
.
repository
.
ancestor?
(
target_branch_sha
,
diff_head_sha
)
end
def
should_be_rebased?
...
...
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