diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-14 18:09:28 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-14 18:09:28 +0300 |
| commit | 307f6d8439ab4bcc33be5c34e63da004b8968634 (patch) | |
| tree | 2d3f4cb2c2a784b17db245e6c98c11ff7f787700 /app/assets/javascripts/notes | |
| parent | 9a5dcad39c5dd81384ae4ec2398435883b944363 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
| -rw-r--r-- | app/assets/javascripts/notes/components/comment_form.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue index cfe674f9c52..54fcf41ca50 100644 --- a/app/assets/javascripts/notes/components/comment_form.vue +++ b/app/assets/javascripts/notes/components/comment_form.vue @@ -397,7 +397,7 @@ export default { :secondary-button-text="__('Cancel')" variant="warning" :dismissible="false" - @primaryAction="forceCloseIssue" + @primaryAction="toggleBlockedIssueWarning(false) && forceCloseIssue()" @secondaryAction="toggleBlockedIssueWarning(false) && enableButton()" > <p> |