diff options
| author | Ruben Davila <rdavila84@gmail.com> | 2017-03-19 03:54:06 +0300 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-03-19 03:54:06 +0300 |
| commit | 1a909d182b18543ed6872b2a72f77f6158ff97a5 (patch) | |
| tree | d3e11cd642cdbdb953903ac677511d14993aaab7 /app | |
| parent | 42f21eb85b21d5a831ad302447b3575cf0b0b4b8 (diff) | |
Fix more broken specs
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/services/mattermost_slash_commands/_help.html.haml | 20 | ||||
| -rw-r--r-- | app/views/projects/services/slack_slash_commands/_help.html.haml | 33 |
2 files changed, 23 insertions, 30 deletions
diff --git a/app/views/projects/services/mattermost_slash_commands/_help.html.haml b/app/views/projects/services/mattermost_slash_commands/_help.html.haml index a26ff6ad631..63b797cd391 100644 --- a/app/views/projects/services/mattermost_slash_commands/_help.html.haml +++ b/app/views/projects/services/mattermost_slash_commands/_help.html.haml @@ -1,16 +1,14 @@ - enabled = Gitlab.config.mattermost.enabled + .well - %p - This service allows users to perform common operations on this - project by entering slash commands in Mattermost. - = link_to help_page_path('user/project/integrations/mattermost_slash_commands.md'), target: '_blank' do - View documentation - = icon('external-link') - %p.inline - See list of available commands in Mattermost after setting up this service, - by entering - %kbd.inline /<trigger> help - - unless enabled || @service.template? + This service allows GitLab users to perform common operations on this + project by entering slash commands in Mattermost. + %br + See list of available commands in Mattermost after setting up this service, + by entering + %code /<command_trigger_word> help + + - unless enabled = render 'projects/services/mattermost_slash_commands/detailed_help', subject: @service - if enabled diff --git a/app/views/projects/services/slack_slash_commands/_help.html.haml b/app/views/projects/services/slack_slash_commands/_help.html.haml index 521ae66dd9b..911bb57c4e7 100644 --- a/app/views/projects/services/slack_slash_commands/_help.html.haml +++ b/app/views/projects/services/slack_slash_commands/_help.html.haml @@ -1,25 +1,20 @@ - run_actions_text = "Perform common operations on this project: #{@project.name_with_namespace}" .well - %p - This service allows users to perform common operations on this - project by entering slash commands in Slack. - = link_to help_page_path('user/project/integrations/slack_slash_commands.md'), target: '_blank' do - View documentation - = icon('external-link') - %p.inline - See list of available commands in Slack after setting up this service, - by entering - %kbd.inline /<command> help - - unless @service.template? - %p To setup this service: - %ul.list-unstyled.indent-list - %li - 1. - = link_to 'https://my.slack.com/services/new/slash-commands', target: '_blank', rel: 'noreferrer noopener nofollow' do - Add a slash command - = icon('external-link') - in your Slack team with these options: + This service allows GitLab users to perform common operations on this + project by entering slash commands in Slack. + %br + See list of available commands in Slack after setting up this service, + by entering + %code /<command> help + %br + %br + To setup this service: + %ul.list-unstyled + %li + 1. + = link_to 'Add a slash command', 'https://my.slack.com/services/new/slash-commands', target: '_blank', rel: 'noreferrer noopener nofollow' + in your Slack team with these options: %hr |