summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2013-10-02 12:50:01 +0200
committerMarin Jankovski <maxlazio@gmail.com>2013-10-02 12:50:01 +0200
commit55880751aacb609d6d9d5bff2dd236c1b1952551 (patch)
tree37c16e8b2429b20d016912e1b3fb140b9e9d2e95 /doc
parentf1253fa7108e6277dcf9e71e0d52279b6f63b93b (diff)
downloadgitlab-ce-55880751aacb609d6d9d5bff2dd236c1b1952551.tar.gz
Update deploy keys, groups and system hooks api docs.
Diffstat (limited to 'doc')
-rw-r--r--doc/api/deploy_keys.md7
-rw-r--r--doc/api/groups.md12
-rw-r--r--doc/api/system_hooks.md19
3 files changed, 30 insertions, 8 deletions
diff --git a/doc/api/deploy_keys.md b/doc/api/deploy_keys.md
index fbb1e45bccd..50d2b82c36f 100644
--- a/doc/api/deploy_keys.md
+++ b/doc/api/deploy_keys.md
@@ -20,13 +20,15 @@ Parameters:
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=",
+ "created_at":"2013-10-02T10:12:29Z"
},
{
"id": 3,
"title" : "Another Public key",
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
- soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
+ soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=",
+ "created_at":"2013-10-02T11:12:29Z"
}
]
```
@@ -51,7 +53,8 @@ Parameters:
"title" : "Public key",
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4
596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4
- soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
+ soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=",
+ "created_at":"2013-10-02T10:12:29Z"
}
```
diff --git a/doc/api/groups.md b/doc/api/groups.md
index fb77901c65b..7fb681dab3f 100644
--- a/doc/api/groups.md
+++ b/doc/api/groups.md
@@ -8,12 +8,12 @@ GET /groups
```json
[
- {
- "id": 1,
- "name": "Foobar Group",
- "path": "foo-bar",
- "owner_id": 18
- }
+ {
+ "id": 1,
+ "name": "Foobar Group",
+ "path": "foo-bar",
+ "owner_id": 18
+ }
]
```
diff --git a/doc/api/system_hooks.md b/doc/api/system_hooks.md
index dca22c43f83..5eeb3652d57 100644
--- a/doc/api/system_hooks.md
+++ b/doc/api/system_hooks.md
@@ -12,6 +12,15 @@ Parameters:
+ **none**
+```json
+[
+ {
+ "id":3,
+ "url":"http://example.com/hook",
+ "created_at":"2013-10-02T10:15:31Z"
+ }
+]
+```
## Add new system hook hook
@@ -34,6 +43,16 @@ Parameters:
+ `id` (required) - The ID of hook
+```json
+{
+ "event_name":"project_create",
+ "name":"Ruby",
+ "path":"ruby",
+ "project_id":1,
+ "owner_name":"Someone",
+ "owner_email":"example@gitlabhq.com"
+}
+```
## Delete system hook