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
5077079f
Commit
5077079f
authored
Apr 05, 2017
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove deprecated field from workhorse response
parent
90e0b2df
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
9 deletions
+2
-9
lib/gitlab/workhorse.rb
lib/gitlab/workhorse.rb
+1
-6
spec/lib/gitlab/workhorse_spec.rb
spec/lib/gitlab/workhorse_spec.rb
+1
-3
No files found.
lib/gitlab/workhorse.rb
View file @
5077079f
...
...
@@ -45,12 +45,7 @@ module Gitlab
raise
"Unsupported action:
#{
action
}
"
end
if
feature_enabled
params
[
:GitalyAddress
]
=
address
# TODO deprecate GitalySocketPath once GITLAB_WORKHORSE_VERSION points
# to a version that supports GitalyAddress.
params
[
:GitalySocketPath
]
=
URI
(
address
).
path
end
params
[
:GitalyAddress
]
=
address
if
feature_enabled
end
params
...
...
spec/lib/gitlab/workhorse_spec.rb
View file @
5077079f
...
...
@@ -188,10 +188,8 @@ describe Gitlab::Workhorse, lib: true do
context
'when Gitaly is enabled'
do
let
(
:gitaly_params
)
do
address
=
Gitlab
::
GitalyClient
.
get_address
(
'default'
)
{
GitalySocketPath
:
URI
(
address
).
path
,
GitalyAddress
:
address
,
GitalyAddress
:
Gitlab
::
GitalyClient
.
get_address
(
'default'
),
}
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