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
660a9028
Commit
660a9028
authored
Apr 30, 2018
by
Douwe Maan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'zj-remove-repo-path-remote-repository' into 'master'
Remove legacy storage path call See merge request gitlab-org/gitlab-ce!18598
parents
649f791e
7d23a2bf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
remote_repository.rb
lib/gitlab/git/remote_repository.rb
+5
-2
repository.rb
lib/gitlab/git/repository.rb
+2
-0
No files found.
lib/gitlab/git/remote_repository.rb
View file @
660a9028
...
...
@@ -12,7 +12,7 @@ module Gitlab
# class.
#
class
RemoteRepository
attr_reader
:
path
,
:
relative_path
,
:gitaly_repository
attr_reader
:relative_path
,
:gitaly_repository
def
initialize
(
repository
)
@relative_path
=
repository
.
relative_path
...
...
@@ -21,7 +21,6 @@ module Gitlab
# These instance variables will not be available in gitaly-ruby, where
# we have no disk access to this repository.
@repository
=
repository
@path
=
repository
.
path
end
def
empty?
...
...
@@ -69,6 +68,10 @@ module Gitlab
env
end
def
path
@repository
.
path
end
private
# Must return an object that responds to 'address' and 'storage'.
...
...
lib/gitlab/git/repository.rb
View file @
660a9028
...
...
@@ -1179,6 +1179,8 @@ module Gitlab
if
is_enabled
gitaly_fetch_ref
(
source_repository
,
source_ref:
source_ref
,
target_ref:
target_ref
)
else
# When removing this code, also remove source_repository#path
# to remove deprecated method calls
local_fetch_ref
(
source_repository
.
path
,
source_ref:
source_ref
,
target_ref:
target_ref
)
end
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