summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-09-02 07:17:44 +0000
committerStan Hu <stanhu@gmail.com>2019-09-02 07:17:44 +0000
commit3b17b390bb38ca4fba4dca348ed6c10e50f110ac (patch)
tree6016d5a8174f88be5c95b35a215b68c552c7ed4b
parent516ce472ef425f6974abac3bff14dfe4ac6501ec (diff)
parentc3c84ff8eaff87e9e8ec76b7d1d10e5495724d34 (diff)
downloadgitlab-ce-3b17b390bb38ca4fba4dca348ed6c10e50f110ac.tar.gz
Merge branch '14634-broken-master-ee-spec-services-slash_commands-global_slack_handler_spec-rb-ce' into 'master'
Resolve "Broken master: ee/spec/services/slash_commands/global_slack_handler_spec.rb" Closes #14634 See merge request gitlab-org/gitlab-ce!32518
-rw-r--r--lib/gitlab/slash_commands/presenters/help.rb16
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/gitlab/slash_commands/presenters/help.rb b/lib/gitlab/slash_commands/presenters/help.rb
index 5421b0b9a84..342dae456a8 100644
--- a/lib/gitlab/slash_commands/presenters/help.rb
+++ b/lib/gitlab/slash_commands/presenters/help.rb
@@ -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