summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-03-06 11:48:33 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2017-03-06 11:49:44 +0100
commit01f99bd26910bb2b0480c44e752bdc7de107cfb1 (patch)
tree3b66549d7185736c33ff576da898fcee33bf4e5d
parent16897d32d2d8fe848c7bbd7ba2acb8ff64bbd0bf (diff)
downloadgitlab-ce-01f99bd26910bb2b0480c44e752bdc7de107cfb1.tar.gz
Update after review
-rw-r--r--doc/api/build_triggers.md1
-rw-r--r--doc/api/v3_to_v4.md3
-rw-r--r--spec/requests/api/triggers_spec.rb2
3 files changed, 5 insertions, 1 deletions
diff --git a/doc/api/build_triggers.md b/doc/api/build_triggers.md
new file mode 100644
index 00000000000..20d924ab35e
--- /dev/null
+++ b/doc/api/build_triggers.md
@@ -0,0 +1 @@
+This document was moved to [Pipeline Triggers](pipeline_triggers.md).
diff --git a/doc/api/v3_to_v4.md b/doc/api/v3_to_v4.md
index 39dc6d98e7b..67ee2b69c3f 100644
--- a/doc/api/v3_to_v4.md
+++ b/doc/api/v3_to_v4.md
@@ -59,3 +59,6 @@ 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)
+- 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`
diff --git a/spec/requests/api/triggers_spec.rb b/spec/requests/api/triggers_spec.rb
index f2effd71755..c4e8c9b09d7 100644
--- a/spec/requests/api/triggers_spec.rb
+++ b/spec/requests/api/triggers_spec.rb
@@ -180,7 +180,7 @@ describe API::Triggers do
end
context 'without required parameters' do
- it 'creates trigger' do
+ it 'does not create trigger' do
post api("/projects/#{project.id}/triggers", user)
expect(response).to have_http_status(:bad_request)