Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
92772f85
Commit
92772f85
authored
Jul 09, 2016
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'api-docs-typos' into 'master'
Fix typos in API documentation See merge request !4949
parents
40ca5874
56aa6d23
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
51 additions
and
44 deletions
+51
-44
doc/api/merge_requests.md
doc/api/merge_requests.md
+9
-9
doc/api/projects.md
doc/api/projects.md
+42
-35
No files found.
doc/api/merge_requests.md
View file @
92772f85
...
...
@@ -49,10 +49,10 @@ Parameters:
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
},
"source_project_id"
:
"2"
,
"target_project_id"
:
"3"
,
"source_project_id"
:
2
,
"target_project_id"
:
3
,
"labels"
:
[
],
"description"
:
"fixed login page css paddings"
,
"description"
:
"fixed login page css paddings"
,
"work_in_progress"
:
false
,
"milestone"
:
{
"id"
:
5
,
...
...
@@ -113,10 +113,10 @@ Parameters:
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
},
"source_project_id"
:
"2"
,
"target_project_id"
:
"3"
,
"source_project_id"
:
2
,
"target_project_id"
:
3
,
"labels"
:
[
],
"description"
:
"fixed login page css paddings"
,
"description"
:
"fixed login page css paddings"
,
"work_in_progress"
:
false
,
"milestone"
:
{
"id"
:
5
,
...
...
@@ -296,7 +296,7 @@ Parameters:
"source_project_id"
:
4
,
"target_project_id"
:
4
,
"labels"
:
[
],
"description"
:
"fixed login page css paddings"
,
"description"
:
"fixed login page css paddings"
,
"work_in_progress"
:
false
,
"milestone"
:
{
"id"
:
5
,
...
...
@@ -465,7 +465,7 @@ Parameters:
"source_project_id"
:
4
,
"target_project_id"
:
4
,
"labels"
:
[
],
"description"
:
"fixed login page css paddings"
,
"description"
:
"fixed login page css paddings"
,
"work_in_progress"
:
false
,
"milestone"
:
{
"id"
:
5
,
...
...
@@ -531,7 +531,7 @@ Parameters:
"source_project_id"
:
4
,
"target_project_id"
:
4
,
"labels"
:
[
],
"description"
:
"fixed login page css paddings"
,
"description"
:
"fixed login page css paddings"
,
"work_in_progress"
:
false
,
"milestone"
:
{
"id"
:
5
,
...
...
doc/api/projects.md
View file @
92772f85
...
...
@@ -52,7 +52,7 @@ Parameters:
"owner"
:
{
"id"
:
3
,
"name"
:
"Diaspora"
,
"created_at"
:
"2013-09-30T13:
46:
02Z"
"created_at"
:
"2013-09-30T13:
46:
02Z"
},
"name"
:
"Diaspora Client"
,
"name_with_namespace"
:
"Diaspora / Diaspora Client"
,
...
...
@@ -64,17 +64,18 @@ Parameters:
"builds_enabled"
:
true
,
"wiki_enabled"
:
true
,
"snippets_enabled"
:
false
,
"created_at"
:
"2013-09-30T13: 46: 02Z"
,
"last_activity_at"
:
"2013-09-30T13: 46: 02Z"
,
"container_registry_enabled"
:
false
,
"created_at"
:
"2013-09-30T13:46:02Z"
,
"last_activity_at"
:
"2013-09-30T13:46:02Z"
,
"creator_id"
:
3
,
"namespace"
:
{
"created_at"
:
"2013-09-30T13:
46:
02Z"
,
"created_at"
:
"2013-09-30T13:
46:
02Z"
,
"description"
:
""
,
"id"
:
3
,
"name"
:
"Diaspora"
,
"owner_id"
:
1
,
"path"
:
"diaspora"
,
"updated_at"
:
"2013-09-30T13:
46:
02Z"
"updated_at"
:
"2013-09-30T13:
46:
02Z"
},
"archived"
:
false
,
"avatar_url"
:
"http://example.com/uploads/project/avatar/4/uploads/avatar.png"
,
...
...
@@ -113,6 +114,7 @@ Parameters:
"builds_enabled"
:
true
,
"wiki_enabled"
:
true
,
"snippets_enabled"
:
false
,
"container_registry_enabled"
:
false
,
"created_at"
:
"2013-09-30T13:46:02Z"
,
"last_activity_at"
:
"2013-09-30T13:46:02Z"
,
"creator_id"
:
3
,
...
...
@@ -225,7 +227,7 @@ Parameters:
"owner"
:
{
"id"
:
3
,
"name"
:
"Diaspora"
,
"created_at"
:
"2013-09-30T13:
46:
02Z"
"created_at"
:
"2013-09-30T13:
46:
02Z"
},
"name"
:
"Diaspora Project Site"
,
"name_with_namespace"
:
"Diaspora / Diaspora Project Site"
,
...
...
@@ -237,17 +239,18 @@ Parameters:
"builds_enabled"
:
true
,
"wiki_enabled"
:
true
,
"snippets_enabled"
:
false
,
"created_at"
:
"2013-09-30T13: 46: 02Z"
,
"last_activity_at"
:
"2013-09-30T13: 46: 02Z"
,
"container_registry_enabled"
:
false
,
"created_at"
:
"2013-09-30T13:46:02Z"
,
"last_activity_at"
:
"2013-09-30T13:46:02Z"
,
"creator_id"
:
3
,
"namespace"
:
{
"created_at"
:
"2013-09-30T13:
46:
02Z"
,
"created_at"
:
"2013-09-30T13:
46:
02Z"
,
"description"
:
""
,
"id"
:
3
,
"name"
:
"Diaspora"
,
"owner_id"
:
1
,
"path"
:
"diaspora"
,
"updated_at"
:
"2013-09-30T13:
46:
02Z"
"updated_at"
:
"2013-09-30T13:
46:
02Z"
},
"permissions"
:
{
"project_access"
:
{
...
...
@@ -555,17 +558,18 @@ Example response:
"builds_enabled"
:
true
,
"wiki_enabled"
:
true
,
"snippets_enabled"
:
false
,
"created_at"
:
"2013-09-30T13: 46: 02Z"
,
"last_activity_at"
:
"2013-09-30T13: 46: 02Z"
,
"container_registry_enabled"
:
false
,
"created_at"
:
"2013-09-30T13:46:02Z"
,
"last_activity_at"
:
"2013-09-30T13:46:02Z"
,
"creator_id"
:
3
,
"namespace"
:
{
"created_at"
:
"2013-09-30T13:
46:
02Z"
,
"created_at"
:
"2013-09-30T13:
46:
02Z"
,
"description"
:
""
,
"id"
:
3
,
"name"
:
"Diaspora"
,
"owner_id"
:
1
,
"path"
:
"diaspora"
,
"updated_at"
:
"2013-09-30T13:
46:
02Z"
"updated_at"
:
"2013-09-30T13:
46:
02Z"
},
"archived"
:
true
,
"avatar_url"
:
"http://example.com/uploads/project/avatar/3/uploads/avatar.png"
,
...
...
@@ -620,17 +624,18 @@ Example response:
"builds_enabled"
:
true
,
"wiki_enabled"
:
true
,
"snippets_enabled"
:
false
,
"created_at"
:
"2013-09-30T13: 46: 02Z"
,
"last_activity_at"
:
"2013-09-30T13: 46: 02Z"
,
"container_registry_enabled"
:
false
,
"created_at"
:
"2013-09-30T13:46:02Z"
,
"last_activity_at"
:
"2013-09-30T13:46:02Z"
,
"creator_id"
:
3
,
"namespace"
:
{
"created_at"
:
"2013-09-30T13:
46:
02Z"
,
"created_at"
:
"2013-09-30T13:
46:
02Z"
,
"description"
:
""
,
"id"
:
3
,
"name"
:
"Diaspora"
,
"owner_id"
:
1
,
"path"
:
"diaspora"
,
"updated_at"
:
"2013-09-30T13:
46:
02Z"
"updated_at"
:
"2013-09-30T13:
46:
02Z"
},
"archived"
:
true
,
"avatar_url"
:
"http://example.com/uploads/project/avatar/3/uploads/avatar.png"
,
...
...
@@ -682,7 +687,7 @@ Example response:
"owner"
:
{
"id"
:
3
,
"name"
:
"Diaspora"
,
"created_at"
:
"2013-09-30T13:
46:
02Z"
"created_at"
:
"2013-09-30T13:
46:
02Z"
},
"name"
:
"Diaspora Project Site"
,
"name_with_namespace"
:
"Diaspora / Diaspora Project Site"
,
...
...
@@ -694,17 +699,18 @@ Example response:
"builds_enabled"
:
true
,
"wiki_enabled"
:
true
,
"snippets_enabled"
:
false
,
"created_at"
:
"2013-09-30T13: 46: 02Z"
,
"last_activity_at"
:
"2013-09-30T13: 46: 02Z"
,
"container_registry_enabled"
:
false
,
"created_at"
:
"2013-09-30T13:46:02Z"
,
"last_activity_at"
:
"2013-09-30T13:46:02Z"
,
"creator_id"
:
3
,
"namespace"
:
{
"created_at"
:
"2013-09-30T13:
46:
02Z"
,
"created_at"
:
"2013-09-30T13:
46:
02Z"
,
"description"
:
""
,
"id"
:
3
,
"name"
:
"Diaspora"
,
"owner_id"
:
1
,
"path"
:
"diaspora"
,
"updated_at"
:
"2013-09-30T13:
46:
02Z"
"updated_at"
:
"2013-09-30T13:
46:
02Z"
},
"permissions"
:
{
"project_access"
:
{
...
...
@@ -767,7 +773,7 @@ Example response:
"owner"
:
{
"id"
:
3
,
"name"
:
"Diaspora"
,
"created_at"
:
"2013-09-30T13:
46:
02Z"
"created_at"
:
"2013-09-30T13:
46:
02Z"
},
"name"
:
"Diaspora Project Site"
,
"name_with_namespace"
:
"Diaspora / Diaspora Project Site"
,
...
...
@@ -779,17 +785,18 @@ Example response:
"builds_enabled"
:
true
,
"wiki_enabled"
:
true
,
"snippets_enabled"
:
false
,
"created_at"
:
"2013-09-30T13: 46: 02Z"
,
"last_activity_at"
:
"2013-09-30T13: 46: 02Z"
,
"container_registry_enabled"
:
false
,
"created_at"
:
"2013-09-30T13:46:02Z"
,
"last_activity_at"
:
"2013-09-30T13:46:02Z"
,
"creator_id"
:
3
,
"namespace"
:
{
"created_at"
:
"2013-09-30T13:
46:
02Z"
,
"created_at"
:
"2013-09-30T13:
46:
02Z"
,
"description"
:
""
,
"id"
:
3
,
"name"
:
"Diaspora"
,
"owner_id"
:
1
,
"path"
:
"diaspora"
,
"updated_at"
:
"2013-09-30T13:
46:
02Z"
"updated_at"
:
"2013-09-30T13:
46:
02Z"
},
"permissions"
:
{
"project_access"
:
{
...
...
@@ -991,11 +998,11 @@ Parameters:
"id"
:
1
,
"url"
:
"http://example.com/hook"
,
"project_id"
:
3
,
"push_events"
:
"true"
,
"issues_events"
:
"true"
,
"merge_requests_events"
:
"true"
,
"note_events"
:
"true"
,
"enable_ssl_verification"
:
"true"
,
"push_events"
:
true
,
"issues_events"
:
true
,
"merge_requests_events"
:
true
,
"note_events"
:
true
,
"enable_ssl_verification"
:
true
,
"created_at"
:
"2012-10-12T17:04:47Z"
}
```
...
...
@@ -1115,8 +1122,8 @@ Parameters:
"name"
:
"Jeremy Ashkenas"
,
"email"
:
"jashkenas@example.com"
},
"authored_date"
:
"2013-09-07T12:
58: 21+00:
00"
,
"committed_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"
},
"protected"
:
false
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment