From 4a38baee3a17121850b8a58eb78e900b53ab6200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Javier=20L=C3=B3pez?= Date: Fri, 18 May 2018 12:56:14 +0200 Subject: Code review comments applied --- lib/api/helpers/related_resources_helpers.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/api/helpers/related_resources_helpers.rb b/lib/api/helpers/related_resources_helpers.rb index c7c11144100..a2cbed30229 100644 --- a/lib/api/helpers/related_resources_helpers.rb +++ b/lib/api/helpers/related_resources_helpers.rb @@ -13,12 +13,12 @@ module API def expose_url(path) url_options = Gitlab::Application.routes.default_url_options - protocol, host, port, script_name = url_options.slice(:protocol, :host, :port, :script_name).values + protocol, host, port, script_name = url_options.values_at(:protocol, :host, :port, :script_name) # Using a blank component at the beginning of the join we ensure # that the resulted path will start with '/'. If the resulted path # does not start with '/', URI::Generic#build will fail - path_with_script_name = File.join('', [script_name, path].map(&:presence).compact) + path_with_script_name = File.join('', [script_name, path].select(&:present?)) URI::Generic.build(scheme: protocol, host: host, port: port, path: path_with_script_name).to_s end -- cgit v1.2.1