From e69fcdff0cdca248ea700b2aeeeaebdc74d6bb07 Mon Sep 17 00:00:00 2001 From: Toon Claes Date: Sun, 11 Mar 2018 22:38:29 +0100 Subject: Respect the protocol in `expose_url` When https is configured in the URL, also use that, and do not set it to http. Closes gitlab-org/gitlab-ee#5217 --- changelogs/unreleased/tc-api-fix-expose_url.yml | 5 +++++ lib/api/helpers/related_resources_helpers.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/tc-api-fix-expose_url.yml diff --git a/changelogs/unreleased/tc-api-fix-expose_url.yml b/changelogs/unreleased/tc-api-fix-expose_url.yml new file mode 100644 index 00000000000..c701f64d6bf --- /dev/null +++ b/changelogs/unreleased/tc-api-fix-expose_url.yml @@ -0,0 +1,5 @@ +--- +title: Ensure the API returns https links when https is configured +merge_request: 17681 +author: +type: fixed 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 -- cgit v1.2.1