Commit 805799b7 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'bump-workhorse' into 'master'

Upgrade GitLab Workhorse to v3.6.0

See merge request gitlab-org/gitlab-ce!16946
parents 9ab4c5b7 11f882ca
No related merge requests found
3.5.1 3.6.0
---
title: Upgrade GitLab Workhorse to v3.6.0
merge_request:
author:
type: other
...@@ -161,6 +161,18 @@ module Gitlab ...@@ -161,6 +161,18 @@ module Gitlab
] ]
end 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) def terminal_websocket(terminal)
details = { details = {
'Terminal' => { 'Terminal' => {
......
...@@ -465,4 +465,21 @@ describe Gitlab::Workhorse do ...@@ -465,4 +465,21 @@ describe Gitlab::Workhorse do
end end
end 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 end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment