Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 8 deletions

diff --git a/lib/gitlab/slash_commands/application_help.rb b/lib/gitlab/slash_commands/application_help.rb
index bfdb65a816d..94abc8b4508 100644
--- a/lib/gitlab/slash_commands/application_help.rb
+++ b/lib/gitlab/slash_commands/application_help.rb
@@ -3,6 +3,11 @@
 module Gitlab
   module SlashCommands
     class ApplicationHelp < BaseCommand
+      def initialize(project, params)
+        @project = project
+        @params = params
+      end
+
       def execute
         Gitlab::SlashCommands::Presenters::Help
           .new(project, commands, params)
@@ -16,11 +21,7 @@ module Gitlab
       end
 
       def commands
-        Gitlab::SlashCommands::Command.new(
-          project,
-          chat_name,
-          params
-        ).commands
+        Gitlab::SlashCommands::Command.commands
       end
     end
   end
diff --git a/lib/gitlab/slash_commands/command.rb b/lib/gitlab/slash_commands/command.rb
index 265eda46489..f8b55f1a91d 100644
--- a/lib/gitlab/slash_commands/command.rb
+++ b/lib/gitlab/slash_commands/command.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module SlashCommands
     class Command < BaseCommand
-      def commands
+      def self.commands
         commands = [
           Gitlab::SlashCommands::IssueShow,
           Gitlab::SlashCommands::IssueNew,
@@ -15,7 +15,7 @@ module Gitlab
           Gitlab::SlashCommands::Run
         ]
 
-        if Feature.enabled?(:incident_declare_slash_command, current_user)
+        if Feature.enabled?(:incident_declare_slash_command)
           commands << Gitlab::SlashCommands::IncidentManagement::IncidentNew
         end
 
@@ -50,7 +50,7 @@ module Gitlab
       private
 
       def available_commands
-        commands.keep_if do |klass|
+        self.class.commands.keep_if do |klass|
           klass.available?(project)
         end
       end