diff options
| author | Sytse Sijbrandij <sytse@gitlab.com> | 2015-02-03 23:12:40 +0000 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@gitlab.com> | 2015-02-03 23:12:40 +0000 |
| commit | 21b742a027f6c2c567d8187c47cb6d99a47c9983 (patch) | |
| tree | 4d78ec14108de7659ab7b71cae9c1a08aa0ee8cc /doc/api | |
| parent | 704922c855a9741b5495db56ac266788a9c25c33 (diff) | |
| parent | e6e337088bbb4736983119928b6b6b451bd3ef20 (diff) | |
| download | gitlab-ce-21b742a027f6c2c567d8187c47cb6d99a47c9983.tar.gz | |
Merge branch 'master' into 'master'
Fix capitalization of URL.
A targeted fix in the documentation.
See merge request !323
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/README.md | 4 | ||||
| -rw-r--r-- | doc/api/services.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/api/README.md b/doc/api/README.md index 8f919f5257d..8cbba8598d5 100644 --- a/doc/api/README.md +++ b/doc/api/README.md @@ -97,7 +97,7 @@ Return values: ## Sudo -All API requests support performing an api call as if you were another user, if your private token is for an administration account. You need to pass `sudo` parameter by url or header with an id or username of the user you want to perform the operation as. If passed as header, the header name must be "SUDO" (capitals). +All API requests support performing an api call as if you were another user, if your private token is for an administration account. You need to pass `sudo` parameter by URL or header with an id or username of the user you want to perform the operation as. If passed as header, the header name must be "SUDO" (capitals). If a non administrative `private_token` is provided then an error message will be returned with status code 403: @@ -142,7 +142,7 @@ When listing resources you can pass the following parameters: - `page` (default: `1`) - page number - `per_page` (default: `20`, max: `100`) - number of items to list per page -[Link headers](http://www.w3.org/wiki/LinkHeader) are send back with each response. These have `rel` prev/next/first/last and contain the relevant URL. Please use these instead of generating your own urls. +[Link headers](http://www.w3.org/wiki/LinkHeader) are send back with each response. These have `rel` prev/next/first/last and contain the relevant URL. Please use these instead of generating your own URLs. ## id vs iid diff --git a/doc/api/services.md b/doc/api/services.md index ab9f9c00c67..93534d5502e 100644 --- a/doc/api/services.md +++ b/doc/api/services.md @@ -13,7 +13,7 @@ PUT /projects/:id/services/gitlab-ci Parameters: - `token` (required) - CI project token -- `project_url` (required) - CI project url +- `project_url` (required) - CI project URL ### Delete GitLab CI service |