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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
36d75be3
Commit
36d75be3
authored
Jun 14, 2018
by
Zeger-Jan van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move TagNames to mandatory through Gitaly
Closes:
https://gitlab.com/gitlab-org/gitaly/issues/220
parent
89095530
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
7 deletions
+15
-7
lib/gitlab/git/repository.rb
lib/gitlab/git/repository.rb
+15
-7
No files found.
lib/gitlab/git/repository.rb
View file @
36d75be3
...
@@ -150,12 +150,8 @@ module Gitlab
...
@@ -150,12 +150,8 @@ module Gitlab
# Returns an Array of branch names
# Returns an Array of branch names
# sorted by name ASC
# sorted by name ASC
def
branch_names
def
branch_names
gitaly_migrate
(
:branch_names
,
status:
Gitlab
::
GitalyClient
::
MigrationStatus
::
OPT_OUT
)
do
|
is_enabled
|
wrapped_gitaly_errors
do
if
is_enabled
gitaly_ref_client
.
branch_names
gitaly_ref_client
.
branch_names
else
branches
.
map
(
&
:name
)
end
end
end
end
end
...
@@ -268,8 +264,10 @@ module Gitlab
...
@@ -268,8 +264,10 @@ module Gitlab
# Returns an Array of tag names
# Returns an Array of tag names
def
tag_names
def
tag_names
wrapped_gitaly_errors
do
gitaly_ref_client
.
tag_names
gitaly_ref_client
.
tag_names
end
end
end
# Returns an Array of Tags
# Returns an Array of Tags
#
#
...
@@ -1420,6 +1418,16 @@ module Gitlab
...
@@ -1420,6 +1418,16 @@ module Gitlab
raise
CommandError
.
new
(
e
)
raise
CommandError
.
new
(
e
)
end
end
def
wrapped_gitaly_errors
(
&
block
)
yield
block
rescue
GRPC
::
NotFound
=>
e
raise
NoRepository
.
new
(
e
)
rescue
GRPC
::
InvalidArgument
=>
e
raise
ArgumentError
.
new
(
e
)
rescue
GRPC
::
BadStatus
=>
e
raise
CommandError
.
new
(
e
)
end
def
clean_stale_repository_files
def
clean_stale_repository_files
gitaly_migrate
(
:repository_cleanup
,
status:
Gitlab
::
GitalyClient
::
MigrationStatus
::
OPT_OUT
)
do
|
is_enabled
|
gitaly_migrate
(
:repository_cleanup
,
status:
Gitlab
::
GitalyClient
::
MigrationStatus
::
OPT_OUT
)
do
|
is_enabled
|
gitaly_repository_client
.
cleanup
if
is_enabled
&&
exists?
gitaly_repository_client
.
cleanup
if
is_enabled
&&
exists?
...
...
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