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
11f882ca
Commit
11f882ca
authored
Feb 06, 2018
by
Kamil Trzciński
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade GitLab Workhorse to v3.6.0
parent
9483cbab
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
1 deletion
+35
-1
GITLAB_WORKHORSE_VERSION
GITLAB_WORKHORSE_VERSION
+1
-1
changelogs/unreleased/bump-workhorse.yml
changelogs/unreleased/bump-workhorse.yml
+5
-0
lib/gitlab/workhorse.rb
lib/gitlab/workhorse.rb
+12
-0
spec/lib/gitlab/workhorse_spec.rb
spec/lib/gitlab/workhorse_spec.rb
+17
-0
No files found.
GITLAB_WORKHORSE_VERSION
View file @
11f882ca
3.
5.1
3.
6.0
changelogs/unreleased/bump-workhorse.yml
0 → 100644
View file @
11f882ca
---
title
:
Upgrade GitLab Workhorse to v3.6.0
merge_request
:
author
:
type
:
other
lib/gitlab/workhorse.rb
View file @
11f882ca
...
...
@@ -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'
=>
{
...
...
spec/lib/gitlab/workhorse_spec.rb
View file @
11f882ca
...
...
@@ -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
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