diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-06 00:09:10 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-06 00:09:10 +0300 |
| commit | a29707687893beecb0e333a12e6f9e093a77eeb9 (patch) | |
| tree | 8d89e554f4d8318a228f9d4717d2a9f75fc10651 /lib/gitlab/quick_actions | |
| parent | 0b789f95a35aa3e4b99ce12fc98bd3cce6555602 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/quick_actions')
| -rw-r--r-- | lib/gitlab/quick_actions/merge_request_actions.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/quick_actions/merge_request_actions.rb b/lib/gitlab/quick_actions/merge_request_actions.rb index 4efa29337d1..abf55f56c73 100644 --- a/lib/gitlab/quick_actions/merge_request_actions.rb +++ b/lib/gitlab/quick_actions/merge_request_actions.rb @@ -285,7 +285,7 @@ module Gitlab end types MergeRequest condition do - Feature.enabled?(:mr_attention_requests, project, default_enabled: :yaml) && + current_user.mr_attention_requests_enabled? && current_user.can?(:"admin_#{quick_action_target.to_ability_name}", project) end parse_params do |attention_param| @@ -321,7 +321,7 @@ module Gitlab end types MergeRequest condition do - Feature.enabled?(:mr_attention_requests, project, default_enabled: :yaml) && + current_user.mr_attention_requests_enabled? && current_user.can?(:"admin_#{quick_action_target.to_ability_name}", project) end parse_params do |attention_param| |