Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/gitlab/quick_actions/command_definition.rb b/lib/gitlab/quick_actions/command_definition.rb
index d9135d1bacb..118c8aad460 100644
--- a/lib/gitlab/quick_actions/command_definition.rb
+++ b/lib/gitlab/quick_actions/command_definition.rb
@@ -149,7 +149,13 @@ module Gitlab
       end
 
       def valid_type?(context)
-        types.blank? || types.any? { |type| context.quick_action_target.is_a?(type) }
+        types.blank? || types.any? do |type|
+          if context.quick_action_target.is_a?(WorkItem)
+            context.quick_action_target.supported_quick_action_commands.include?(name.to_sym)
+          else
+            context.quick_action_target.is_a?(type)
+          end
+        end
       end
     end
   end