summaryrefslogtreecommitdiff
path: root/lib/gitlab/quick_actions/issue_actions.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-01-06 18:10:52 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-01-06 18:10:52 +0000
commit653048c5eeb8351344155d5e03a7d5a6138ba6ec (patch)
tree85ae41bb39070a2293c6b48fe56028da43cca51f /lib/gitlab/quick_actions/issue_actions.rb
parent04a42f5e032537fc95c5158379748a7ff44385d5 (diff)
downloadgitlab-ce-653048c5eeb8351344155d5e03a7d5a6138ba6ec.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/quick_actions/issue_actions.rb')
-rw-r--r--lib/gitlab/quick_actions/issue_actions.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/quick_actions/issue_actions.rb b/lib/gitlab/quick_actions/issue_actions.rb
index 1822b0c8bd5..c162ee545c6 100644
--- a/lib/gitlab/quick_actions/issue_actions.rb
+++ b/lib/gitlab/quick_actions/issue_actions.rb
@@ -170,7 +170,8 @@ module Gitlab
end
types Issue
condition do
- !quick_action_target.confidential? &&
+ quick_action_target.issue_type_supports?(:confidentiality) &&
+ !quick_action_target.confidential? &&
current_user.can?(:"admin_#{quick_action_target.to_ability_name}", quick_action_target)
end
command :confidential do