diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-12-22 06:47:54 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-12-22 06:47:54 +0000 |
commit | 4423b299b73e2b96b980b848fab5cf374361572b (patch) | |
tree | 8f2c7b12b3c267efda53918f67210225fac017ff /app/assets/javascripts/api.js | |
parent | 0b5947849a32991904f8cbc5e4612d2438b97e0b (diff) | |
parent | 36f4710301926bb853b35d9b14a60e03b42def34 (diff) | |
download | gitlab-ce-4423b299b73e2b96b980b848fab5cf374361572b.tar.gz |
Merge branch 'master' into 22643-manual-job-page
* master: (68 commits)
Last push event widget width for fixed layout
Added 'admin' persona
Docs: move article Artifactory + GL to subject-related folder
Mention GitLab Pages when changing username
Consolidate the docs when changing a repo path
Add docs for automatic redirects when renaming namespaces
move "Transfer an existing project into a group" to project docs
Do not show Vue pagination if only one page
Resolve "Decouple multi-file editor from file list"
Update Ruby version to 2.3.6
Skip projects filter on merge requests search
Fall back to the `MergeRequestWidgetEntity`
LDAP extern_uids are not normalized when updated via API
organise content by subject
Restore missing language code in datetime_utility.js
Add support for defining explicit dependencies to QA factories
Document mounting volumes with Docker-in-Docker
add missing word to pawel-reduce_cardinality_of_prometheus_metrics.yml
Use seconds where possible, and convert to milliseconds for Influxdb consumption
update dispatcher to allow for dynamic imports until webpack plugin is updated
...
Diffstat (limited to 'app/assets/javascripts/api.js')
-rw-r--r-- | app/assets/javascripts/api.js | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js index d963101028a..21d8c790e90 100644 --- a/app/assets/javascripts/api.js +++ b/app/assets/javascripts/api.js @@ -1,4 +1,5 @@ import $ from 'jquery'; +import axios from './lib/utils/axios_utils'; const Api = { groupsPath: '/api/:version/groups.json', @@ -6,6 +7,7 @@ const Api = { namespacesPath: '/api/:version/namespaces.json', groupProjectsPath: '/api/:version/groups/:id/projects.json', projectsPath: '/api/:version/projects.json', + projectPath: '/api/:version/projects/:id', projectLabelsPath: '/:namespace_path/:project_path/labels', groupLabelsPath: '/groups/:namespace_path/labels', licensePath: '/api/:version/templates/licenses/:key', @@ -76,6 +78,14 @@ const Api = { .done(projects => callback(projects)); }, + // Return single project + project(projectPath) { + const url = Api.buildUrl(Api.projectPath) + .replace(':id', encodeURIComponent(projectPath)); + + return axios.get(url); + }, + newLabel(namespacePath, projectPath, data, callback) { let url; @@ -115,7 +125,7 @@ const Api = { commitMultiple(id, data) { // see https://docs.gitlab.com/ce/api/commits.html#create-a-commit-with-multiple-files-and-actions const url = Api.buildUrl(Api.commitPath) - .replace(':id', id); + .replace(':id', encodeURIComponent(id)); return this.wrapAjaxCall({ url, type: 'POST', @@ -127,7 +137,7 @@ const Api = { branchSingle(id, branch) { const url = Api.buildUrl(Api.branchSinglePath) - .replace(':id', id) + .replace(':id', encodeURIComponent(id)) .replace(':branch', branch); return this.wrapAjaxCall({ |