diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-03-12 18:00:50 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-03-13 18:46:19 +0300 |
| commit | da15e7329affe3d7f4169ce4b558d2066434eb8f (patch) | |
| tree | 66a4e25f979145b52f396cfd199daf585b951459 /lib | |
| parent | 17823b144ac745395286825272d0c3b4e4e52f50 (diff) | |
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 |