Commit 57fd233a authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg Committed by Z.J. van de Weg

Update docs and unexpose token

parent a4827ee2
...@@ -27,11 +27,14 @@ Example response: ...@@ -27,11 +27,14 @@ Example response:
```json ```json
[ [
{ {
"id" : 1, "id":1,
"url" : "https://gitlab.example.com/hook", "url":"https://gitlab.example.com/hook",
"created_at" : "2015-11-04T20:07:35.874Z" "created_at":"2016-10-31T12:32:15.192Z",
} "push_events":true,
"tag_push_events":false,
"enable_ssl_verification":true
}
] ]
``` ```
...@@ -48,6 +51,10 @@ POST /hooks ...@@ -48,6 +51,10 @@ POST /hooks
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
| --------- | ---- | -------- | ----------- | | --------- | ---- | -------- | ----------- |
| `url` | string | yes | The hook URL | | `url` | string | yes | The hook URL |
| token | string | no | The token to validate payloads |
| push_events | boolean | no | When true, the hook will fire on push events |
| tag_push_events | boolean | no | When true, the hook will fire on new tags being pushed |
| enable_ssl_verification | boolean | no | Do SSL verification when triggering the hook |
Example request: Example request:
...@@ -59,11 +66,14 @@ Example response: ...@@ -59,11 +66,14 @@ Example response:
```json ```json
[ [
{ {
"id" : 2, "id":1,
"url" : "https://gitlab.example.com/hook", "url":"https://gitlab.example.com/hook",
"created_at" : "2015-11-04T20:07:35.874Z" "created_at":"2016-10-31T12:32:15.192Z",
} "push_events":true,
"tag_push_events":false,
"enable_ssl_verification":true
}
] ]
``` ```
......
...@@ -44,7 +44,7 @@ module API ...@@ -44,7 +44,7 @@ module API
class Hook < Grape::Entity class Hook < Grape::Entity
expose :id, :url, :created_at, :push_events, :tag_push_events expose :id, :url, :created_at, :push_events, :tag_push_events
expose :enable_ssl_verification, :token expose :enable_ssl_verification
end end
class ProjectHook < Hook class ProjectHook < Hook
......
...@@ -12,6 +12,7 @@ module API ...@@ -12,6 +12,7 @@ module API
end end
get do get do
hooks = SystemHook.all hooks = SystemHook.all
present hooks, with: Entities::Hook present hooks, with: Entities::Hook
end end
......
...@@ -30,7 +30,6 @@ describe API::API, api: true do ...@@ -30,7 +30,6 @@ describe API::API, api: true do
it "returns an array of hooks" do it "returns an array of hooks" do
get api("/hooks", admin) get api("/hooks", admin)
byebug
expect(response).to have_http_status(200) expect(response).to have_http_status(200)
expect(json_response).to be_an Array expect(json_response).to be_an Array
expect(json_response.first['url']).to eq(hook.url) expect(json_response.first['url']).to eq(hook.url)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment