diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-03-06 13:50:32 +0300 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-03-06 16:34:47 +0300 |
| commit | 75123fa9f706a6ab7cdd5dba4393ad9d8bac0947 (patch) | |
| tree | 39beb2ae628d37005d3be7d09957ea4616421a77 /doc | |
| parent | 194223476b8df57a56ba096c7a300d51d2e3e750 (diff) | |
Incorporate review, drop old endpoint
The endpoint dropped, get ':id/repository/commits/:sha/jobs', should be
replace by a new endpoint.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/services.md | 14 | ||||
| -rw-r--r-- | doc/api/v3_to_v4.md | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/doc/api/services.md b/doc/api/services.md index 4bb45497d11..8e7afe41b0c 100644 --- a/doc/api/services.md +++ b/doc/api/services.md @@ -70,7 +70,7 @@ GET /projects/:id/services/assembla ## Atlassian Bamboo CI -A continuous integration and job server +A continuous integration and build server ### Create/Edit Atlassian Bamboo CI service @@ -85,7 +85,7 @@ PUT /projects/:id/services/bamboo Parameters: - `bamboo_url` (**required**) - Bamboo root URL like https://bamboo.example.com -- `job_key` (**required**) - Bamboo job plan key like KEY +- `build_key` (**required**) - Bamboo build plan key like KEY - `username` (**required**) - A user with API access, if applicable - `password` (**required**) @@ -114,13 +114,13 @@ Continuous integration and deployments Set Buildkite service for a project. ``` -PUT /projects/:id/services/jobkite +PUT /projects/:id/services/buildkite ``` Parameters: - `token` (**required**) - Buildkite project GitLab token -- `project_url` (**required**) - https://jobkite.com/example/project +- `project_url` (**required**) - https://buildkite.com/example/project - `enable_ssl_verification` (optional) - Enable SSL verification ### Delete Buildkite service @@ -128,7 +128,7 @@ Parameters: Delete Buildkite service for a project. ``` -DELETE /projects/:id/services/jobkite +DELETE /projects/:id/services/buildkite ``` ### Get Buildkite service settings @@ -136,12 +136,12 @@ DELETE /projects/:id/services/jobkite Get Buildkite service settings for a project. ``` -GET /projects/:id/services/jobkite +GET /projects/:id/services/buildkite ``` ## Build-Emails -Get emails for GitLab CI jobs. +Get emails for GitLab CI builds. ### Create/Edit Build-Emails service diff --git a/doc/api/v3_to_v4.md b/doc/api/v3_to_v4.md index 67ee2b69c3f..1d24e625f22 100644 --- a/doc/api/v3_to_v4.md +++ b/doc/api/v3_to_v4.md @@ -59,6 +59,8 @@ changes are in V4: - Return 202 with JSON body on async removals on V4 API (DELETE `/projects/:id/repository/merged_branches` and DELETE `/projects/:id`) [!9449](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9449) - `projects/:id/milestones?iid[]=x&iid[]=y` array filter has been renamed to `iids` [!9096](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9096) - Return basic info about pipeline in `GET /projects/:id/pipelines` [!8875](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8875) +- Renamed all `build` references to `job` [!9463](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9463) +- Drop GET '/projects/:id/repository/commits/:sha/jobs' [!9463](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9463) - Rename Build Triggers to be Pipeline Triggers API [!9713](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9713) - `POST /projects/:id/trigger/builds` to `POST /projects/:id/trigger/pipeline` - Require description when creating a new trigger `POST /projects/:id/triggers` |