Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
9c4973e91d9a
Commit
78a84421
authored
Apr 05, 2017
by
Sean McGivern
Browse files
Merge branch 'workhorse-1.4.3' into 'master'
Workhorse 1.4.3 Closes gitaly#167 and gitaly#177 See merge request !10479
parents
d0c7ba7ee1c4
940ed2d125bc
Changes
3
Hide whitespace changes
Inline
Side-by-side
GITLAB_WORKHORSE_VERSION
View file @
9c4973e9
1.4.
2
1.4.
3
lib/gitlab/workhorse.rb
View file @
9c4973e9
...
...
@@ -45,12 +45,7 @@ def git_http_ok(repository, user, action)
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 @
9c4973e9
...
...
@@ -188,10 +188,8 @@ def call_verify(headers)
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