Skip to content

G
gitlab-ce
Commit 7ac86084 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Fix wrong conflict resolution 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 1b76627f
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
app/assets/javascripts/api.js.coffee
View file @ 7ac86084
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
groupPath: "/api/:version/groups/:id.json" groupPath: "/api/:version/groups/:id.json"
namespacesPath: "/api/:version/namespaces.json" namespacesPath: "/api/:version/namespaces.json"
groupProjectsPath: "/api/:version/groups/:id/projects.json" groupProjectsPath: "/api/:version/groups/:id/projects.json"
projectsPath: "/api/:version/projects.json?simple=true" projectsPath: "/api/:version/projects.json"
labelsPath: "/:namespace_path/:project_path/labels" labelsPath: "/:namespace_path/:project_path/labels"
licensePath: "/api/:version/licenses/:key" licensePath: "/api/:version/licenses/:key"
gitignorePath: "/api/:version/gitignores/:key" gitignorePath: "/api/:version/gitignores/:key"
......
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