Download as
Browse Code »

Commit 5e96d070210690d5513d575045b312625ae1cd75

Authored by Marin Jankovski
1 parent f22e6c91
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Update snippets and merge request api documentation

Showing 2 changed files with 15 additions and 20 deletions   Show diff stats
doc/api/merge_requests.md
  Diff comments   View file @5e96d07
@@ -19,14 +19,13 @@ Parameters: @@ -19,14 +19,13 @@ Parameters:
19 "source_branch":"test1", 19 "source_branch":"test1",
20 "project_id":3, 20 "project_id":3,
21 "title":"test1", 21 "title":"test1",
22 - "closed":true,  
23 - "merged":false, 22 + "state":"opened",
24 "author":{ 23 "author":{
25 "id":1, 24 "id":1,
26 "username": "admin", 25 "username": "admin",
27 "email":"admin@local.host", 26 "email":"admin@local.host",
28 "name":"Administrator", 27 "name":"Administrator",
29 - "blocked":false, 28 + "state":"active",
30 "created_at":"2012-04-29T08:46:00Z" 29 "created_at":"2012-04-29T08:46:00Z"
31 }, 30 },
32 "assignee":{ 31 "assignee":{
@@ -34,7 +33,7 @@ Parameters: @@ -34,7 +33,7 @@ Parameters:
34 "username": "admin", 33 "username": "admin",
35 "email":"admin@local.host", 34 "email":"admin@local.host",
36 "name":"Administrator", 35 "name":"Administrator",
37 - "blocked":false, 36 + "state":"active",
38 "created_at":"2012-04-29T08:46:00Z" 37 "created_at":"2012-04-29T08:46:00Z"
39 } 38 }
40 } 39 }
@@ -62,14 +61,13 @@ Parameters: @@ -62,14 +61,13 @@ Parameters:
62 "source_branch":"test1", 61 "source_branch":"test1",
63 "project_id":3, 62 "project_id":3,
64 "title":"test1", 63 "title":"test1",
65 - "closed":true,  
66 - "merged":false, 64 + "state":"merged",
67 "author":{ 65 "author":{
68 "id":1, 66 "id":1,
69 "username": "admin", 67 "username": "admin",
70 "email":"admin@local.host", 68 "email":"admin@local.host",
71 "name":"Administrator", 69 "name":"Administrator",
72 - "blocked":false, 70 + "state":"active",
73 "created_at":"2012-04-29T08:46:00Z" 71 "created_at":"2012-04-29T08:46:00Z"
74 }, 72 },
75 "assignee":{ 73 "assignee":{
@@ -77,7 +75,7 @@ Parameters: @@ -77,7 +75,7 @@ Parameters:
77 "username": "admin", 75 "username": "admin",
78 "email":"admin@local.host", 76 "email":"admin@local.host",
79 "name":"Administrator", 77 "name":"Administrator",
80 - "blocked":false, 78 + "state":"active",
81 "created_at":"2012-04-29T08:46:00Z" 79 "created_at":"2012-04-29T08:46:00Z"
82 } 80 }
83 } 81 }
@@ -97,7 +95,7 @@ Parameters: @@ -97,7 +95,7 @@ Parameters:
97 + `id` (required) - The ID of a project 95 + `id` (required) - The ID of a project
98 + `source_branch` (required) - The source branch 96 + `source_branch` (required) - The source branch
99 + `target_branch` (required) - The target branch 97 + `target_branch` (required) - The target branch
100 -+ `assignee_id` - Assignee user ID 98 ++ `assignee_id` (optional) - Assignee user ID
101 + `title` (required) - Title of MR 99 + `title` (required) - Title of MR
102 100
103 ```json 101 ```json
@@ -107,14 +105,13 @@ Parameters: @@ -107,14 +105,13 @@ Parameters:
107 "source_branch":"test1", 105 "source_branch":"test1",
108 "project_id":3, 106 "project_id":3,
109 "title":"test1", 107 "title":"test1",
110 - "closed":true,  
111 - "merged":false, 108 + "state":"opened",
112 "author":{ 109 "author":{
113 "id":1, 110 "id":1,
114 "username": "admin", 111 "username": "admin",
115 "email":"admin@local.host", 112 "email":"admin@local.host",
116 "name":"Administrator", 113 "name":"Administrator",
117 - "blocked":false, 114 + "state":"active",
118 "created_at":"2012-04-29T08:46:00Z" 115 "created_at":"2012-04-29T08:46:00Z"
119 }, 116 },
120 "assignee":{ 117 "assignee":{
@@ -122,7 +119,7 @@ Parameters: @@ -122,7 +119,7 @@ Parameters:
122 "username": "admin", 119 "username": "admin",
123 "email":"admin@local.host", 120 "email":"admin@local.host",
124 "name":"Administrator", 121 "name":"Administrator",
125 - "blocked":false, 122 + "state":"active",
126 "created_at":"2012-04-29T08:46:00Z" 123 "created_at":"2012-04-29T08:46:00Z"
127 } 124 }
128 } 125 }
@@ -145,24 +142,22 @@ Parameters: @@ -145,24 +142,22 @@ Parameters:
145 + `target_branch` - The target branch 142 + `target_branch` - The target branch
146 + `assignee_id` - Assignee user ID 143 + `assignee_id` - Assignee user ID
147 + `title` - Title of MR 144 + `title` - Title of MR
148 -+ `closed` - Status of MR. true - closed  
149 -  
150 145
151 ```json 146 ```json
  147 +
152 { 148 {
153 "id":1, 149 "id":1,
154 "target_branch":"master", 150 "target_branch":"master",
155 "source_branch":"test1", 151 "source_branch":"test1",
156 "project_id":3, 152 "project_id":3,
157 "title":"test1", 153 "title":"test1",
158 - "closed":true,  
159 - "merged":false, 154 + "state":"opened",
160 "author":{ 155 "author":{
161 "id":1, 156 "id":1,
162 "username": "admin", 157 "username": "admin",
163 "email":"admin@local.host", 158 "email":"admin@local.host",
164 "name":"Administrator", 159 "name":"Administrator",
165 - "blocked":false, 160 + "state":"active",
166 "created_at":"2012-04-29T08:46:00Z" 161 "created_at":"2012-04-29T08:46:00Z"
167 }, 162 },
168 "assignee":{ 163 "assignee":{
@@ -170,7 +165,7 @@ Parameters: @@ -170,7 +165,7 @@ Parameters:
170 "username": "admin", 165 "username": "admin",
171 "email":"admin@local.host", 166 "email":"admin@local.host",
172 "name":"Administrator", 167 "name":"Administrator",
173 - "blocked":false, 168 + "state":"active",
174 "created_at":"2012-04-29T08:46:00Z" 169 "created_at":"2012-04-29T08:46:00Z"
175 } 170 }
176 } 171 }
doc/api/project_snippets.md
  Diff comments   View file @5e96d07
@@ -34,7 +34,7 @@ Parameters: @@ -34,7 +34,7 @@ Parameters:
34 "username": "john_smith", 34 "username": "john_smith",
35 "email": "john@example.com", 35 "email": "john@example.com",
36 "name": "John Smith", 36 "name": "John Smith",
37 - "blocked": false, 37 + "state": "active",
38 "created_at": "2012-05-23T08:00:58Z" 38 "created_at": "2012-05-23T08:00:58Z"
39 }, 39 },
40 "expires_at": null, 40 "expires_at": null,