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
b604bb55
Commit
b604bb55
authored
Aug 16, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use rugged_is_ancestor? instead of Gitaly when it is called inside a loop
parent
79ed8e83
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/models/repository.rb
app/models/repository.rb
+2
-2
No files found.
app/models/repository.rb
View file @
b604bb55
...
...
@@ -989,7 +989,7 @@ class Repository
upstream_commit
=
commit
(
"refs/remotes/
#{
MIRROR_REMOTE
}
/
#{
branch_name
}
"
)
if
upstream_commit
!
is_ancestor?
(
branch_commit
.
id
,
upstream_commit
.
id
)
!
rugged_
is_ancestor?
(
branch_commit
.
id
,
upstream_commit
.
id
)
else
false
end
...
...
@@ -1000,7 +1000,7 @@ class Repository
upstream_commit
=
commit
(
"refs/remotes/
#{
remote_ref
}
/
#{
branch_name
}
"
)
if
upstream_commit
!
is_ancestor?
(
upstream_commit
.
id
,
branch_commit
.
id
)
!
rugged_
is_ancestor?
(
upstream_commit
.
id
,
branch_commit
.
id
)
else
false
end
...
...
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