Commit 7a2a744c authored by Bob Van Landuyt's avatar Bob Van Landuyt

Add maintainer edit allowed to the EE-MR-Widget

parent 846a7a5a
...@@ -535,7 +535,6 @@ Creates a new merge request. ...@@ -535,7 +535,6 @@ Creates a new merge request.
POST /projects/:id/merge_requests POST /projects/:id/merge_requests
``` ```
<<<<<<< HEAD
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
| --------- | ---- | -------- | ----------- | | --------- | ---- | -------- | ----------- |
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
...@@ -635,7 +634,6 @@ Updates an existing merge request. You can change the target branch, title, or e ...@@ -635,7 +634,6 @@ Updates an existing merge request. You can change the target branch, title, or e
PUT /projects/:id/merge_requests/:merge_request_iid PUT /projects/:id/merge_requests/:merge_request_iid
``` ```
<<<<<<< HEAD
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
| --------- | ---- | -------- | ----------- | | --------- | ---- | -------- | ----------- |
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
......
...@@ -377,6 +377,8 @@ export default { ...@@ -377,6 +377,8 @@ export default {
v-if="shouldRenderRelatedLinks" v-if="shouldRenderRelatedLinks"
:related-links="mr.relatedLinks" :related-links="mr.relatedLinks"
/> />
<mr-widget-maintainer-edit
:maintainerEditAllowed="mr.maintainerEditAllowed" />
</div> </div>
<div class="mr-widget-footer" v-if="shouldRenderMergeHelp"> <div class="mr-widget-footer" v-if="shouldRenderMergeHelp">
<mr-widget-merge-help /> <mr-widget-merge-help />
......
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