Merge branch 'bump-workhorse' into 'master'
Upgrade GitLab Workhorse to v3.6.0 See merge request gitlab-org/gitlab-ce!16946
This commit is contained in:
commit
805799b71b
4 changed files with 35 additions and 1 deletions
|
@ -1 +1 @@
|
|||
3.5.1
|
||||
3.6.0
|
||||
|
|
5
changelogs/unreleased/bump-workhorse.yml
Normal file
5
changelogs/unreleased/bump-workhorse.yml
Normal file
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Upgrade GitLab Workhorse to v3.6.0
|
||||
merge_request:
|
||||
author:
|
||||
type: other
|
|
@ -161,6 +161,18 @@ module Gitlab
|
|||
]
|
||||
end
|
||||
|
||||
def send_url(url, allow_redirects: false)
|
||||
params = {
|
||||
'URL' => url,
|
||||
'AllowRedirects' => allow_redirects
|
||||
}
|
||||
|
||||
[
|
||||
SEND_DATA_HEADER,
|
||||
"send-url:#{encode(params)}"
|
||||
]
|
||||
end
|
||||
|
||||
def terminal_websocket(terminal)
|
||||
details = {
|
||||
'Terminal' => {
|
||||
|
|
|
@ -465,4 +465,21 @@ describe Gitlab::Workhorse do
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '.send_url' do
|
||||
let(:url) { 'http://example.com' }
|
||||
|
||||
subject { described_class.send_url(url) }
|
||||
|
||||
it 'sets the header correctly' do
|
||||
key, command, params = decode_workhorse_header(subject)
|
||||
|
||||
expect(key).to eq("Gitlab-Workhorse-Send-Data")
|
||||
expect(command).to eq("send-url")
|
||||
expect(params).to eq({
|
||||
'URL' => url,
|
||||
'AllowRedirects' => false
|
||||
}.deep_stringify_keys)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue