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
c8d62c39
Commit
c8d62c39
authored
Jan 31, 2018
by
Jacob Vosmaer (GitLab)
Committed by
Douwe Maan
Jan 31, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove some Rugged dependencies from Repository
parent
8ae67a61
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
+2
-8
app/models/repository.rb
app/models/repository.rb
+2
-8
No files found.
app/models/repository.rb
View file @
c8d62c39
...
@@ -869,7 +869,7 @@ class Repository
...
@@ -869,7 +869,7 @@ class Repository
upstream_commit
=
commit
(
"refs/remotes/
#{
MIRROR_REMOTE
}
/
#{
branch_name
}
"
)
upstream_commit
=
commit
(
"refs/remotes/
#{
MIRROR_REMOTE
}
/
#{
branch_name
}
"
)
if
upstream_commit
if
upstream_commit
!
r
ugged_is_
ancestor?
(
branch_commit
.
id
,
upstream_commit
.
id
)
!
r
aw_repository
.
ancestor?
(
branch_commit
.
id
,
upstream_commit
.
id
)
else
else
false
false
end
end
...
@@ -880,7 +880,7 @@ class Repository
...
@@ -880,7 +880,7 @@ class Repository
upstream_commit
=
commit
(
"refs/remotes/
#{
remote_ref
}
/
#{
branch_name
}
"
)
upstream_commit
=
commit
(
"refs/remotes/
#{
remote_ref
}
/
#{
branch_name
}
"
)
if
upstream_commit
if
upstream_commit
!
r
ugged_is_
ancestor?
(
upstream_commit
.
id
,
branch_commit
.
id
)
!
r
aw_repository
.
ancestor?
(
upstream_commit
.
id
,
branch_commit
.
id
)
else
else
false
false
end
end
...
@@ -984,12 +984,6 @@ class Repository
...
@@ -984,12 +984,6 @@ class Repository
end
end
end
end
def
main_language
return
unless
exists?
Linguist
::
Repository
.
new
(
rugged
,
rugged
.
head
.
target_id
).
language
end
# Caches the supplied block both in a cache and in an instance variable.
# Caches the supplied block both in a cache and in an instance variable.
#
#
# The cache key and instance variable are named the same way as the value of
# The cache key and instance variable are named the same way as the value of
...
...
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