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

5 files changed, 7 insertions, 7 deletions

diff --git a/lib/gitlab/slash_commands/application_help.rb b/lib/gitlab/slash_commands/application_help.rb
index 94abc8b4508..8d747cab2a1 100644
--- a/lib/gitlab/slash_commands/application_help.rb
+++ b/lib/gitlab/slash_commands/application_help.rb
@@ -17,7 +17,7 @@ module Gitlab
       private
 
       def trigger
-        "#{params[:command]} [project name or alias]"
+        params[:command].to_s
       end
 
       def commands
diff --git a/lib/gitlab/slash_commands/issue_close.rb b/lib/gitlab/slash_commands/issue_close.rb
index 5d33f2fe62d..885c08ce9d5 100644
--- a/lib/gitlab/slash_commands/issue_close.rb
+++ b/lib/gitlab/slash_commands/issue_close.rb
@@ -29,7 +29,7 @@ module Gitlab
       private
 
       def close_issue(issue:)
-        ::Issues::CloseService.new(project: project, current_user: current_user).execute(issue)
+        ::Issues::CloseService.new(container: project, current_user: current_user).execute(issue)
       end
 
       def presenter(issue)
diff --git a/lib/gitlab/slash_commands/issue_move.rb b/lib/gitlab/slash_commands/issue_move.rb
index 9f10da247d7..e42cdd0d433 100644
--- a/lib/gitlab/slash_commands/issue_move.rb
+++ b/lib/gitlab/slash_commands/issue_move.rb
@@ -29,7 +29,7 @@ module Gitlab
           return Gitlab::SlashCommands::Presenters::Access.new.not_found
         end
 
-        new_issue = ::Issues::MoveService.new(project: project, current_user: current_user)
+        new_issue = ::Issues::MoveService.new(container: project, current_user: current_user)
                       .execute(old_issue, target_project)
 
         presenter(new_issue).present(old_issue)
diff --git a/lib/gitlab/slash_commands/issue_new.rb b/lib/gitlab/slash_commands/issue_new.rb
index 1527fd263e0..508526ac500 100644
--- a/lib/gitlab/slash_commands/issue_new.rb
+++ b/lib/gitlab/slash_commands/issue_new.rb
@@ -37,7 +37,7 @@ module Gitlab
       private
 
       def create_issue(title:, description:)
-        ::Issues::CreateService.new(project: project, current_user: current_user, params: { title: title, description: description }, spam_params: nil).execute
+        ::Issues::CreateService.new(container: project, current_user: current_user, params: { title: title, description: description }, spam_params: nil).execute
       end
 
       def presenter(issue)
diff --git a/lib/gitlab/slash_commands/presenters/help.rb b/lib/gitlab/slash_commands/presenters/help.rb
index 61b36308d20..395f7aab050 100644
--- a/lib/gitlab/slash_commands/presenters/help.rb
+++ b/lib/gitlab/slash_commands/presenters/help.rb
@@ -26,7 +26,7 @@ module Gitlab
             MESSAGE
           end
 
-          if text.start_with?('help')
+          if text && text.start_with?('help')
             <<~MESSAGE
               #{full_commands_message(trigger)}
 
@@ -69,9 +69,9 @@ module Gitlab
           list = @commands
             .map do |command|
               if command < Gitlab::SlashCommands::IncidentManagement::IncidentCommand
-                "#{@params[:command]} #{command.help_message}"
-              else
                 "#{trigger} #{command.help_message}"
+              else
+                "#{trigger} [project name or alias] #{command.help_message}"
               end
             end
             .join("\n")