diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /lib/gitlab/quick_actions/issue_and_merge_request_actions.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'lib/gitlab/quick_actions/issue_and_merge_request_actions.rb')
-rw-r--r-- | lib/gitlab/quick_actions/issue_and_merge_request_actions.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/quick_actions/issue_and_merge_request_actions.rb b/lib/gitlab/quick_actions/issue_and_merge_request_actions.rb index b7d58e05651..b53fdd60606 100644 --- a/lib/gitlab/quick_actions/issue_and_merge_request_actions.rb +++ b/lib/gitlab/quick_actions/issue_and_merge_request_actions.rb @@ -155,6 +155,7 @@ module Gitlab params '<1w 3d 2h 14m>' types Issue, MergeRequest condition do + quick_action_target.supports_time_tracking? && current_user.can?(:"admin_#{quick_action_target.to_ability_name}", project) end parse_params do |raw_duration| @@ -177,6 +178,7 @@ module Gitlab params '<time(1h30m | -1h30m)> <date(YYYY-MM-DD)>' types Issue, MergeRequest condition do + quick_action_target.supports_time_tracking? && current_user.can?(:"admin_#{quick_action_target.to_ability_name}", quick_action_target) end parse_params do |raw_time_date| |