diff options
author | Paul Slaughter <pslaughter@gitlab.com> | 2019-04-24 20:30:46 +0300 |
---|---|---|
committer | Paul Slaughter <pslaughter@gitlab.com> | 2019-04-24 21:05:29 +0300 |
commit | 4abd43609795e1cc0652396b6a00bc38ed237371 (patch) | |
tree | e5fa007d8022e1bcd3512c6c33757be7bbd981da /app/assets/javascripts/api.js | |
parent | 8b2592ee744438711f449062ff2dc26101e57833 (diff) |
Fix API and IDE path with `/` relative_url_root
**Why?**
Previously we simply concatenated our paths, which led
to requesting `//api/v4/...` and obviously failed. The BE
supports a relative_url_root of `/`. It's a bug that the FE
does not.
Diffstat (limited to 'app/assets/javascripts/api.js')
-rw-r--r-- | app/assets/javascripts/api.js | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js index 8754c253881..e583a8affd4 100644 --- a/app/assets/javascripts/api.js +++ b/app/assets/javascripts/api.js @@ -1,6 +1,7 @@ import $ from 'jquery'; import _ from 'underscore'; import axios from './lib/utils/axios_utils'; +import { joinPaths } from './lib/utils/url_utility'; const Api = { groupsPath: '/api/:version/groups.json', @@ -339,11 +340,7 @@ const Api = { }, buildUrl(url) { - let urlRoot = ''; - if (gon.relative_url_root != null) { - urlRoot = gon.relative_url_root; - } - return urlRoot + url.replace(':version', gon.api_version); + return joinPaths(gon.relative_url_root || '', url.replace(':version', gon.api_version)); }, }; |