Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

3 files changed, 9 insertions, 3 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
diff --git a/lib/gitlab/quick_actions/issuable_actions.rb b/lib/gitlab/quick_actions/issuable_actions.rb
index a12457d89c9..96e3112f32f 100644
--- a/lib/gitlab/quick_actions/issuable_actions.rb
+++ b/lib/gitlab/quick_actions/issuable_actions.rb
@@ -248,7 +248,7 @@ module Gitlab
 
           if severity
             if quick_action_target.persisted?
-              ::Issues::UpdateService.new(project: quick_action_target.project, current_user: current_user, params: { severity: severity }).execute(quick_action_target)
+              ::Issues::UpdateService.new(container: quick_action_target.project, current_user: current_user, params: { severity: severity }).execute(quick_action_target)
             else
               quick_action_target.build_issuable_severity(severity: severity)
             end
diff --git a/lib/gitlab/quick_actions/issue_actions.rb b/lib/gitlab/quick_actions/issue_actions.rb
index f782f2802b6..ae8bc102f57 100644
--- a/lib/gitlab/quick_actions/issue_actions.rb
+++ b/lib/gitlab/quick_actions/issue_actions.rb
@@ -320,7 +320,7 @@ module Gitlab
       private
 
       def zoom_link_service
-        ::Issues::ZoomLinkService.new(project: quick_action_target.project, current_user: current_user, params: { issue: quick_action_target })
+        ::Issues::ZoomLinkService.new(container: quick_action_target.project, current_user: current_user, params: { issue: quick_action_target })
       end
 
       def zoom_link_params