diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-06-07 10:57:35 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-06-07 10:57:35 +0100 |
| commit | eb9632aab2f027393ab34158453114fd281e4d55 (patch) | |
| tree | e9047cb60db1092a1e1a0cdf1c9759b3bb753156 /lib/api/helpers | |
| parent | 399085d6f5f0bbbd61f1286a93e76aa2371f9143 (diff) | |
| parent | fd19f887dfeeeedb483c4a4fb32f9f768e89389c (diff) | |
| download | gitlab-ce-62788-graphql-pagination.tar.gz | |
Merge branch 'master' into 62788-graphql-pagination62788-graphql-pagination
* master: (61 commits)
Add dependency list documentation
added code differences from EE to CE
Remove metrics_time_window feature flag
SSoT audit fixes
Integrate demo link into content more
Add styles and animations for onboarding helper
Add git 2.21 install from update_source
IDE trigger files change event
Remove 'build-page' from 'ide-terminal' element
Add section to dev docs on accessing chatops
Fix OpenID Connect documentation
Make OpenID Connect work without requiring a name
Apply reviewer feedback
Change text to match screencaps
Reword for clarity
Upgrade jira user permissions workflow docs
Fix some typoes
Removes duplicated shared_context folder
Add frontend support for cluster health alerts
Add changelog entry for sidekiq metrics
...
Diffstat (limited to 'lib/api/helpers')
| -rw-r--r-- | lib/api/helpers/pagination.rb | 2 |
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 |