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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
7a2a744c
Commit
7a2a744c
authored
Mar 07, 2018
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add maintainer edit allowed to the EE-MR-Widget
parent
846a7a5a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
doc/api/merge_requests.md
doc/api/merge_requests.md
+0
-2
ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
...javascripts/vue_merge_request_widget/mr_widget_options.js
+2
-0
No files found.
doc/api/merge_requests.md
View file @
7a2a744c
...
@@ -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 |
...
...
ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
View file @
7a2a744c
...
@@ -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 />
...
...
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