diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-03-12 15:00:50 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-03-12 15:00:50 +0000 |
| commit | 30bebe049ddf9ecbf6f7b3dbd0b53209e616823c (patch) | |
| tree | d169e4fcf0112bbe312fd5fd7e0084d08833dd60 /lib | |
| parent | 4bc58ca210d8c984c20e88c19e74b53e9505905b (diff) | |
| parent | 3802006436d6834ee0a8052b22773cb65c4447b5 (diff) | |
| download | gitlab-ce-30bebe049ddf9ecbf6f7b3dbd0b53209e616823c.tar.gz | |
Merge branch 'tc-api-fix-expose_url' into 'master'
Respect the protocol in `expose_url`
Closes gitlab-ee#5217
See merge request gitlab-org/gitlab-ce!17681
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/helpers/related_resources_helpers.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/helpers/related_resources_helpers.rb b/lib/api/helpers/related_resources_helpers.rb index 1f677529b07..7f4d6e58b34 100644 --- a/lib/api/helpers/related_resources_helpers.rb +++ b/lib/api/helpers/related_resources_helpers.rb @@ -15,7 +15,7 @@ module API url_options = Gitlab::Application.routes.default_url_options protocol, host, port = url_options.slice(:protocol, :host, :port).values - URI::HTTP.build(scheme: protocol, host: host, port: port, path: path).to_s + URI::Generic.build(scheme: protocol, host: host, port: port, path: path).to_s end private |