Commit f97542aa authored by Stan Hu's avatar Stan Hu

Merge branch...

Merge branch '14634-broken-master-ee-spec-services-slash_commands-global_slack_handler_spec-rb' into 'master'

Resolve "Broken master: ee/spec/services/slash_commands/global_slack_handler_spec.rb"

Closes #14634

See merge request gitlab-org/gitlab-ee!15976
parents 9468a7dc 8ddc62b1
......@@ -13,7 +13,7 @@ module SlashCommands
return false unless valid_token?
if help_command?
return Gitlab::SlashCommands::ApplicationHelp.new(params).execute
return Gitlab::SlashCommands::ApplicationHelp.new(nil, params).execute
end
unless integration = find_integration
......
......@@ -43,16 +43,24 @@ module Gitlab
end
def help_footer
message = @project ? project_info : ''
message += <<~MESSAGE
*Documentation*
For more information about GitLab chatops, refer to its
documentation: https://docs.gitlab.com/ce/ci/chatops/README.html.
MESSAGE
message
end
def project_info
<<~MESSAGE
*Project*
The GitLab project for this chatops integration can be found at
#{url_for(@project)}.
*Documentation*
For more information about GitLab chatops, refer to its
documentation: https://docs.gitlab.com/ce/ci/chatops/README.html.
MESSAGE
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment