summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/api.js
diff options
context:
space:
mode:
authorMartin Hanzel <mhanzel@gitlab.com>2019-06-05 10:18:12 +0200
committerMartin Hanzel <mhanzel@gitlab.com>2019-06-05 10:18:12 +0200
commit03c72e998dd8016ccda0a6b9515dd3fc0302978a (patch)
tree1f7e1623637de75c2807ef7d40f0feae08c687f3 /app/assets/javascripts/api.js
parent3aeea7fb0c1d6389df6d8643ef40dd54aa84d1a8 (diff)
parentb560ce1e666733f12c65e8b9f659c89256c1775b (diff)
downloadgitlab-ce-mh/notes-spec.tar.gz
Merge branch 'master' into mh/notes-specmh/notes-spec
Diffstat (limited to 'app/assets/javascripts/api.js')
-rw-r--r--app/assets/javascripts/api.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js
index e583a8affd4..7cebb88f3a4 100644
--- a/app/assets/javascripts/api.js
+++ b/app/assets/javascripts/api.js
@@ -12,7 +12,7 @@ const Api = {
groupProjectsPath: '/api/:version/groups/:id/projects.json',
projectsPath: '/api/:version/projects.json',
projectPath: '/api/:version/projects/:id',
- projectLabelsPath: '/:namespace_path/:project_path/labels',
+ projectLabelsPath: '/:namespace_path/:project_path/-/labels',
projectMergeRequestsPath: '/api/:version/projects/:id/merge_requests',
projectMergeRequestPath: '/api/:version/projects/:id/merge_requests/:mrid',
projectMergeRequestChangesPath: '/api/:version/projects/:id/merge_requests/:mrid/changes',