Skip to content

G
gitlab-ce
Commit 65709e0a authored by Lin Jen-Shin's avatar Lin Jen-Shin
Browse files
Options

Resolve app/assets/javascripts/api.js

parent bdd14a7b
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
app/assets/javascripts/api.js
View file @ 65709e0a
...@@ -25,10 +25,7 @@ const Api = { ...@@ -25,10 +25,7 @@ const Api = {
commitPipelinesPath: '/:project_id/commit/:sha/pipelines', commitPipelinesPath: '/:project_id/commit/:sha/pipelines',
branchSinglePath: '/api/:version/projects/:id/repository/branches/:branch', branchSinglePath: '/api/:version/projects/:id/repository/branches/:branch',
createBranchPath: '/api/:version/projects/:id/repository/branches', createBranchPath: '/api/:version/projects/:id/repository/branches',
<<<<<<< HEAD
geoNodesPath: '/api/:version/geo_nodes', geoNodesPath: '/api/:version/geo_nodes',
=======
>>>>>>> upstream/master
group(groupId, callback) { group(groupId, callback) {
const url = Api.buildUrl(Api.groupPath).replace(':id', groupId); const url = Api.buildUrl(Api.groupPath).replace(':id', groupId);
...@@ -241,7 +238,6 @@ const Api = { ...@@ -241,7 +238,6 @@ const Api = {
}); });
}, },
<<<<<<< HEAD
approverUsers(search, options, callback = $.noop) { approverUsers(search, options, callback = $.noop) {
const url = Api.buildUrl('/autocomplete/users.json'); const url = Api.buildUrl('/autocomplete/users.json');
return axios return axios
...@@ -278,8 +274,6 @@ const Api = { ...@@ -278,8 +274,6 @@ const Api = {
}); });
}, },
=======
>>>>>>> upstream/master
buildUrl(url) { buildUrl(url) {
let urlRoot = ''; let urlRoot = '';
if (gon.relative_url_root != null) { if (gon.relative_url_root != null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7