summaryrefslogtreecommitdiff
path: root/lib/api/helpers/pagination.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2019-06-06 15:47:54 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2019-06-06 15:47:54 +0000
commita90e9de349004b9c2202c16c66880861952d6758 (patch)
tree08ef25c1cd1b4883360551a160cfa9da9219df9c /lib/api/helpers/pagination.rb
parent6298e32f27283abb87883b1d5f5ac93c16791fe8 (diff)
parenta1088c7a3143b4b65991ce70100baf039ecb5eea (diff)
downloadgitlab-ce-a90e9de349004b9c2202c16c66880861952d6758.tar.gz
Merge branch '62847-url-for-the-next-request-with-pagination-is-missing-port' into 'master'
Resolve "Url for the next request with pagination is missing port" Closes #62847 See merge request gitlab-org/gitlab-ce!29267
Diffstat (limited to 'lib/api/helpers/pagination.rb')
-rw-r--r--lib/api/helpers/pagination.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/helpers/pagination.rb b/lib/api/helpers/pagination.rb
index 94b58a64d26..2a9b17ad22a 100644
--- a/lib/api/helpers/pagination.rb
+++ b/lib/api/helpers/pagination.rb
@@ -23,7 +23,7 @@ module API
def base_request_uri
@base_request_uri ||= URI.parse(request.url).tap do |uri|
uri.host = Gitlab.config.gitlab.host
- uri.port = nil
+ uri.port = Gitlab.config.gitlab.port
end
end