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