Skip to content

G
gitlab-ce
Commit 92772f85 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis
Browse files
Options

Merge branch 'api-docs-typos' into 'master' 

Fix typos in API documentation

See merge request !4949
parents 40ca5874 56aa6d23
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 44 deletions
doc/api/merge_requests.md
View file @ 92772f85
...@@ -49,10 +49,10 @@ Parameters: ...@@ -49,10 +49,10 @@ Parameters:
"state": "active", "state": "active",
"created_at": "2012-04-29T08:46:00Z" "created_at": "2012-04-29T08:46:00Z"
}, },
"source_project_id": "2", "source_project_id": 2,
"target_project_id": "3", "target_project_id": 3,
"labels": [ ], "labels": [ ],
"description":"fixed login page css paddings", "description": "fixed login page css paddings",
"work_in_progress": false, "work_in_progress": false,
"milestone": { "milestone": {
"id": 5, "id": 5,
...@@ -113,10 +113,10 @@ Parameters: ...@@ -113,10 +113,10 @@ Parameters:
"state": "active", "state": "active",
"created_at": "2012-04-29T08:46:00Z" "created_at": "2012-04-29T08:46:00Z"
}, },
"source_project_id": "2", "source_project_id": 2,
"target_project_id": "3", "target_project_id": 3,
"labels": [ ], "labels": [ ],
"description":"fixed login page css paddings", "description": "fixed login page css paddings",
"work_in_progress": false, "work_in_progress": false,
"milestone": { "milestone": {
"id": 5, "id": 5,
...@@ -296,7 +296,7 @@ Parameters: ...@@ -296,7 +296,7 @@ Parameters:
"source_project_id": 4, "source_project_id": 4,
"target_project_id": 4, "target_project_id": 4,
"labels": [ ], "labels": [ ],
"description":"fixed login page css paddings", "description": "fixed login page css paddings",
"work_in_progress": false, "work_in_progress": false,
"milestone": { "milestone": {
"id": 5, "id": 5,
...@@ -465,7 +465,7 @@ Parameters: ...@@ -465,7 +465,7 @@ Parameters:
"source_project_id": 4, "source_project_id": 4,
"target_project_id": 4, "target_project_id": 4,
"labels": [ ], "labels": [ ],
"description":"fixed login page css paddings", "description": "fixed login page css paddings",
"work_in_progress": false, "work_in_progress": false,
"milestone": { "milestone": {
"id": 5, "id": 5,
...@@ -531,7 +531,7 @@ Parameters: ...@@ -531,7 +531,7 @@ Parameters:
"source_project_id": 4, "source_project_id": 4,
"target_project_id": 4, "target_project_id": 4,
"labels": [ ], "labels": [ ],
"description":"fixed login page css paddings", "description": "fixed login page css paddings",
"work_in_progress": false, "work_in_progress": false,
"milestone": { "milestone": {
"id": 5, "id": 5,
......
doc/api/projects.md
View file @ 92772f85
...@@ -52,7 +52,7 @@ Parameters: ...@@ -52,7 +52,7 @@ Parameters:
"owner": { "owner": {
"id": 3, "id": 3,
"name": "Diaspora", "name": "Diaspora",
"created_at": "2013-09-30T13: 46: 02Z" "created_at": "2013-09-30T13:46:02Z"
}, },
"name": "Diaspora Client", "name": "Diaspora Client",
"name_with_namespace": "Diaspora / Diaspora Client", "name_with_namespace": "Diaspora / Diaspora Client",
...@@ -64,17 +64,18 @@ Parameters: ...@@ -64,17 +64,18 @@ Parameters:
"builds_enabled": true, "builds_enabled": true,
"wiki_enabled": true, "wiki_enabled": true,
"snippets_enabled": false, "snippets_enabled": false,
"created_at": "2013-09-30T13: 46: 02Z", "container_registry_enabled": false,
"last_activity_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"last_activity_at": "2013-09-30T13:46:02Z",
"creator_id": 3, "creator_id": 3,
"namespace": { "namespace": {
"created_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"description": "", "description": "",
"id": 3, "id": 3,
"name": "Diaspora", "name": "Diaspora",
"owner_id": 1, "owner_id": 1,
"path": "diaspora", "path": "diaspora",
"updated_at": "2013-09-30T13: 46: 02Z" "updated_at": "2013-09-30T13:46:02Z"
}, },
"archived": false, "archived": false,
"avatar_url": "http://example.com/uploads/project/avatar/4/uploads/avatar.png", "avatar_url": "http://example.com/uploads/project/avatar/4/uploads/avatar.png",
...@@ -113,6 +114,7 @@ Parameters: ...@@ -113,6 +114,7 @@ Parameters:
"builds_enabled": true, "builds_enabled": true,
"wiki_enabled": true, "wiki_enabled": true,
"snippets_enabled": false, "snippets_enabled": false,
"container_registry_enabled": false,
"created_at": "2013-09-30T13:46:02Z", "created_at": "2013-09-30T13:46:02Z",
"last_activity_at": "2013-09-30T13:46:02Z", "last_activity_at": "2013-09-30T13:46:02Z",
"creator_id": 3, "creator_id": 3,
...@@ -225,7 +227,7 @@ Parameters: ...@@ -225,7 +227,7 @@ Parameters:
"owner": { "owner": {
"id": 3, "id": 3,
"name": "Diaspora", "name": "Diaspora",
"created_at": "2013-09-30T13: 46: 02Z" "created_at": "2013-09-30T13:46:02Z"
}, },
"name": "Diaspora Project Site", "name": "Diaspora Project Site",
"name_with_namespace": "Diaspora / Diaspora Project Site", "name_with_namespace": "Diaspora / Diaspora Project Site",
...@@ -237,17 +239,18 @@ Parameters: ...@@ -237,17 +239,18 @@ Parameters:
"builds_enabled": true, "builds_enabled": true,
"wiki_enabled": true, "wiki_enabled": true,
"snippets_enabled": false, "snippets_enabled": false,
"created_at": "2013-09-30T13: 46: 02Z", "container_registry_enabled": false,
"last_activity_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"last_activity_at": "2013-09-30T13:46:02Z",
"creator_id": 3, "creator_id": 3,
"namespace": { "namespace": {
"created_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"description": "", "description": "",
"id": 3, "id": 3,
"name": "Diaspora", "name": "Diaspora",
"owner_id": 1, "owner_id": 1,
"path": "diaspora", "path": "diaspora",
"updated_at": "2013-09-30T13: 46: 02Z" "updated_at": "2013-09-30T13:46:02Z"
}, },
"permissions": { "permissions": {
"project_access": { "project_access": {
...@@ -555,17 +558,18 @@ Example response: ...@@ -555,17 +558,18 @@ Example response:
"builds_enabled": true, "builds_enabled": true,
"wiki_enabled": true, "wiki_enabled": true,
"snippets_enabled": false, "snippets_enabled": false,
"created_at": "2013-09-30T13: 46: 02Z", "container_registry_enabled": false,
"last_activity_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"last_activity_at": "2013-09-30T13:46:02Z",
"creator_id": 3, "creator_id": 3,
"namespace": { "namespace": {
"created_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"description": "", "description": "",
"id": 3, "id": 3,
"name": "Diaspora", "name": "Diaspora",
"owner_id": 1, "owner_id": 1,
"path": "diaspora", "path": "diaspora",
"updated_at": "2013-09-30T13: 46: 02Z" "updated_at": "2013-09-30T13:46:02Z"
}, },
"archived": true, "archived": true,
"avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png", "avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png",
...@@ -620,17 +624,18 @@ Example response: ...@@ -620,17 +624,18 @@ Example response:
"builds_enabled": true, "builds_enabled": true,
"wiki_enabled": true, "wiki_enabled": true,
"snippets_enabled": false, "snippets_enabled": false,
"created_at": "2013-09-30T13: 46: 02Z", "container_registry_enabled": false,
"last_activity_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"last_activity_at": "2013-09-30T13:46:02Z",
"creator_id": 3, "creator_id": 3,
"namespace": { "namespace": {
"created_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"description": "", "description": "",
"id": 3, "id": 3,
"name": "Diaspora", "name": "Diaspora",
"owner_id": 1, "owner_id": 1,
"path": "diaspora", "path": "diaspora",
"updated_at": "2013-09-30T13: 46: 02Z" "updated_at": "2013-09-30T13:46:02Z"
}, },
"archived": true, "archived": true,
"avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png", "avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png",
...@@ -682,7 +687,7 @@ Example response: ...@@ -682,7 +687,7 @@ Example response:
"owner": { "owner": {
"id": 3, "id": 3,
"name": "Diaspora", "name": "Diaspora",
"created_at": "2013-09-30T13: 46: 02Z" "created_at": "2013-09-30T13:46:02Z"
}, },
"name": "Diaspora Project Site", "name": "Diaspora Project Site",
"name_with_namespace": "Diaspora / Diaspora Project Site", "name_with_namespace": "Diaspora / Diaspora Project Site",
...@@ -694,17 +699,18 @@ Example response: ...@@ -694,17 +699,18 @@ Example response:
"builds_enabled": true, "builds_enabled": true,
"wiki_enabled": true, "wiki_enabled": true,
"snippets_enabled": false, "snippets_enabled": false,
"created_at": "2013-09-30T13: 46: 02Z", "container_registry_enabled": false,
"last_activity_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"last_activity_at": "2013-09-30T13:46:02Z",
"creator_id": 3, "creator_id": 3,
"namespace": { "namespace": {
"created_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"description": "", "description": "",
"id": 3, "id": 3,
"name": "Diaspora", "name": "Diaspora",
"owner_id": 1, "owner_id": 1,
"path": "diaspora", "path": "diaspora",
"updated_at": "2013-09-30T13: 46: 02Z" "updated_at": "2013-09-30T13:46:02Z"
}, },
"permissions": { "permissions": {
"project_access": { "project_access": {
...@@ -767,7 +773,7 @@ Example response: ...@@ -767,7 +773,7 @@ Example response:
"owner": { "owner": {
"id": 3, "id": 3,
"name": "Diaspora", "name": "Diaspora",
"created_at": "2013-09-30T13: 46: 02Z" "created_at": "2013-09-30T13:46:02Z"
}, },
"name": "Diaspora Project Site", "name": "Diaspora Project Site",
"name_with_namespace": "Diaspora / Diaspora Project Site", "name_with_namespace": "Diaspora / Diaspora Project Site",
...@@ -779,17 +785,18 @@ Example response: ...@@ -779,17 +785,18 @@ Example response:
"builds_enabled": true, "builds_enabled": true,
"wiki_enabled": true, "wiki_enabled": true,
"snippets_enabled": false, "snippets_enabled": false,
"created_at": "2013-09-30T13: 46: 02Z", "container_registry_enabled": false,
"last_activity_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"last_activity_at": "2013-09-30T13:46:02Z",
"creator_id": 3, "creator_id": 3,
"namespace": { "namespace": {
"created_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"description": "", "description": "",
"id": 3, "id": 3,
"name": "Diaspora", "name": "Diaspora",
"owner_id": 1, "owner_id": 1,
"path": "diaspora", "path": "diaspora",
"updated_at": "2013-09-30T13: 46: 02Z" "updated_at": "2013-09-30T13:46:02Z"
}, },
"permissions": { "permissions": {
"project_access": { "project_access": {
...@@ -991,11 +998,11 @@ Parameters: ...@@ -991,11 +998,11 @@ Parameters:
"id": 1, "id": 1,
"url": "http://example.com/hook", "url": "http://example.com/hook",
"project_id": 3, "project_id": 3,
"push_events": "true", "push_events": true,
"issues_events": "true", "issues_events": true,
"merge_requests_events": "true", "merge_requests_events": true,
"note_events": "true", "note_events": true,
"enable_ssl_verification": "true", "enable_ssl_verification": true,
"created_at": "2012-10-12T17:04:47Z" "created_at": "2012-10-12T17:04:47Z"
} }
``` ```
...@@ -1115,8 +1122,8 @@ Parameters: ...@@ -1115,8 +1122,8 @@ Parameters:
"name": "Jeremy Ashkenas", "name": "Jeremy Ashkenas",
"email": "jashkenas@example.com" "email": "jashkenas@example.com"
}, },
"authored_date": "2013-09-07T12: 58: 21+00: 00", "authored_date": "2013-09-07T12:58:21+00:00",
"committed_date": "2013-09-07T12: 58: 21+00: 00" "committed_date": "2013-09-07T12:58:21+00:00"
}, },
"protected": false "protected": false
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7