Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

2 files changed, 24 insertions, 2 deletions

diff --git a/lib/gitlab/slash_commands/presenters/help.rb b/lib/gitlab/slash_commands/presenters/help.rb
index 71bc0dc0123..61b36308d20 100644
--- a/lib/gitlab/slash_commands/presenters/help.rb
+++ b/lib/gitlab/slash_commands/presenters/help.rb
@@ -4,9 +4,10 @@ module Gitlab
   module SlashCommands
     module Presenters
       class Help < Presenters::Base
-        def initialize(project, commands)
+        def initialize(project, commands, params = {})
           @project = project
           @commands = commands
+          @params = params
         end
 
         def present(trigger, text)
@@ -66,7 +67,13 @@ module Gitlab
 
         def full_commands_message(trigger)
           list = @commands
-            .map { |command| "#{trigger} #{command.help_message}" }
+            .map do |command|
+              if command < Gitlab::SlashCommands::IncidentManagement::IncidentCommand
+                "#{@params[:command]} #{command.help_message}"
+              else
+                "#{trigger} #{command.help_message}"
+              end
+            end
             .join("\n")
 
           <<~MESSAGE
diff --git a/lib/gitlab/slash_commands/presenters/incident_management/incident_new.rb b/lib/gitlab/slash_commands/presenters/incident_management/incident_new.rb
new file mode 100644
index 00000000000..5030c8282db
--- /dev/null
+++ b/lib/gitlab/slash_commands/presenters/incident_management/incident_new.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module SlashCommands
+    module Presenters
+      module IncidentManagement
+        class IncidentNew < Presenters::Base
+          def present(message)
+            ephemeral_response(text: message)
+          end
+        end
+      end
+    end
+  end
+end