diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-28 21:04:13 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-28 21:04:13 +0300 |
| commit | 7ac860849cc322d2fe9c5cde037c31754202e29d (patch) | |
| tree | 982ead6d6f54ac94df1dec2a0b1d947762886b3a | |
| parent | 1b76627f8f9a4199e39bb8e5c584af3afc2e4b94 (diff) | |
Fix wrong conflict resolution
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | app/assets/javascripts/api.js.coffee | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/api.js.coffee b/app/assets/javascripts/api.js.coffee index 9a8fed23ab4..fa670f49ae5 100644 --- a/app/assets/javascripts/api.js.coffee +++ b/app/assets/javascripts/api.js.coffee @@ -3,7 +3,7 @@ groupPath: "/api/:version/groups/:id.json" namespacesPath: "/api/:version/namespaces.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" licensePath: "/api/:version/licenses/:key" gitignorePath: "/api/:version/gitignores/:key" |