summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcharlieablett <cablett@gitlab.com>2019-09-02 17:35:45 +1200
committercharlieablett <cablett@gitlab.com>2019-09-02 17:35:45 +1200
commit23bb9424c0f0f872cb33e61169a56abe5e7e6985 (patch)
treece9e3a0d21150d641973e79d9913c087c1ebf426
parentcd8d008cb95ce2321b7cdb36433ff40375043ce9 (diff)
downloadgitlab-ce-23bb9424c0f0f872cb33e61169a56abe5e7e6985.tar.gz
Handle projectless `help` commands to chatops
- Pass in a nil project to Gitlab::SlashCommands::ApplicationHelp.new if the chatops command is help. - Modify the Gitlab::SlashCommands::Presenters::Help message to skip printing out project information.
-rw-r--r--lib/gitlab/slash_commands/presenters/help.rb14
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/gitlab/slash_commands/presenters/help.rb b/lib/gitlab/slash_commands/presenters/help.rb
index 5421b0b9a84..bb2298f8395 100644
--- a/lib/gitlab/slash_commands/presenters/help.rb
+++ b/lib/gitlab/slash_commands/presenters/help.rb
@@ -44,15 +44,21 @@ module Gitlab
def help_footer
<<~MESSAGE
+ #{project_info if @project}
+ *Documentation*
+
+ For more information about GitLab chatops, refer to its
+ documentation: https://docs.gitlab.com/ce/ci/chatops/README.html.
+ 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