kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'do-not-reopen-merged-mr' into 'master' 

Remove a "reopen merge request button" on a "merged" merge request

Closes #54039

See merge request gitlab-org/gitlab-ce!26965
This commit is contained in:
Mike Greiling 2019-04-09 15:50:49 +00:00
parent c715bcec06 631c3d64bf
commit 39cb1c069f
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/notes/components/comment_form.vue
View File

@ -115,8 +115,11 @@ export default {
author() { author() {
return this.getUserData; return this.getUserData;
}, },
canUpdateIssue() { canToggleIssueState() {
return this.getNoteableData.current_user.can_update; return (
this.getNoteableData.current_user.can_update &&
this.getNoteableData.state !== constants.MERGED
);
}, },
endpoint() { endpoint() {
return this.getNoteableData.create_note_path; return this.getNoteableData.create_note_path;
@ -415,7 +418,7 @@ append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown"
</div> </div>
<loading-button <loading-button
v-if="canUpdateIssue" v-if="canToggleIssueState"
:loading="isToggleStateButtonLoading" :loading="isToggleStateButtonLoading"
:container-class="[ :container-class="[
actionButtonClassNames, actionButtonClassNames,

1
app/assets/javascripts/notes/constants.js
View File

@ -7,6 +7,7 @@ export const COMMENT = 'comment';
export const OPENED = 'opened'; export const OPENED = 'opened';
export const REOPENED = 'reopened'; export const REOPENED = 'reopened';
export const CLOSED = 'closed'; export const CLOSED = 'closed';
export const MERGED = 'merged';
export const EMOJI_THUMBSUP = 'thumbsup'; export const EMOJI_THUMBSUP = 'thumbsup';
export const EMOJI_THUMBSDOWN = 'thumbsdown'; export const EMOJI_THUMBSDOWN = 'thumbsdown';
export const ISSUE_NOTEABLE_TYPE = 'issue'; export const ISSUE_NOTEABLE_TYPE = 'issue';

5
changelogs/unreleased/do-not-reopen-merged-mr.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Remove a "reopen merge request button" on a "merged" merge request
merge_request: 26965
author: Hiroyuki Sato
type: fixed