summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-07-16 11:02:37 +0100
committerPhil Hughes <me@iamphill.com>2019-07-16 11:02:37 +0100
commitdbc1544840a582ee509df017690ae3ff2666bc1b (patch)
tree022b7392fd3ee42528526d4c1b078f77b50308c3 /app
parentc29da98f5296d894e8f4e0694bb008169a5bb6a8 (diff)
downloadgitlab-ce-dbc1544840a582ee509df017690ae3ff2666bc1b.tar.gz
Fixed create merge request button not enabling
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64454
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/create_merge_request_dropdown.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/create_merge_request_dropdown.js b/app/assets/javascripts/create_merge_request_dropdown.js
index 052168bb21c..dce9c1a5410 100644
--- a/app/assets/javascripts/create_merge_request_dropdown.js
+++ b/app/assets/javascripts/create_merge_request_dropdown.js
@@ -182,7 +182,7 @@ export default class CreateMergeRequestDropdown {
}
enable() {
- if (!canCreateConfidentialMergeRequest()) return;
+ if (isConfidentialIssue() && !canCreateConfidentialMergeRequest()) return;
this.createMergeRequestButton.classList.remove('disabled');
this.createMergeRequestButton.removeAttribute('disabled');