From 631c3d64bf7b493b0139a9e10f4491289cf6bb3e Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Thu, 4 Apr 2019 00:26:03 +0900 Subject: [PATCH] Remove a "reopen merge request button" on a "merged" merge request --- app/assets/javascripts/notes/components/comment_form.vue | 9 ++++++--- app/assets/javascripts/notes/constants.js | 1 + changelogs/unreleased/do-not-reopen-merged-mr.yml | 5 +++++ 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 changelogs/unreleased/do-not-reopen-merged-mr.yml diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue index 1d6cb9485f7..b30d7fa9b73 100644 --- a/app/assets/javascripts/notes/components/comment_form.vue +++ b/app/assets/javascripts/notes/components/comment_form.vue @@ -115,8 +115,11 @@ export default { author() { return this.getUserData; }, - canUpdateIssue() { - return this.getNoteableData.current_user.can_update; + canToggleIssueState() { + return ( + this.getNoteableData.current_user.can_update && + this.getNoteableData.state !== constants.MERGED + ); }, endpoint() { return this.getNoteableData.create_note_path; @@ -415,7 +418,7 @@ append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown"