diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2016-11-21 13:43:31 +0100 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2016-11-21 17:58:40 +0100 |
| commit | 67fde38806bd843c8008766edf49023e4c63df81 (patch) | |
| tree | 0aefbe0aabdd1d57cfa6b4a0ac1afd056baa1c19 /app/views/projects/services | |
| parent | e74e53ae98bd7656eb84e907e25f2ad0b70afde9 (diff) | |
| download | gitlab-ce-67fde38806bd843c8008766edf49023e4c63df81.tar.gz | |
Improve the mattermost help box
Also added tests, and moved the slack test to a better location.
Diffstat (limited to 'app/views/projects/services')
| -rw-r--r-- | app/views/projects/services/mattermost_slash_commands/_help.html.haml (renamed from app/views/projects/services/mattermost_command/_help.html.haml) | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/views/projects/services/mattermost_command/_help.html.haml b/app/views/projects/services/mattermost_slash_commands/_help.html.haml index c6e0e883752..15aa2006c02 100644 --- a/app/views/projects/services/mattermost_command/_help.html.haml +++ b/app/views/projects/services/mattermost_slash_commands/_help.html.haml @@ -1,5 +1,5 @@ - pretty_path_with_namespace = "#{@project ? @project.namespace.name : 'namespace'} / #{@project ? @project.name : 'name'}" -- run_actions_text = "Run action on the GitLab project: #{pretty_path_with_namespace}" +- run_actions_text = "Perform common operations on this project: #{pretty_path_with_namespace}" .well %p @@ -15,7 +15,7 @@ %li 1. = link_to 'Enable custom slash commands', 'https://docs.mattermost.com/developer/slash-commands.html#enabling-custom-commands' - on your Mattermost installation. + on your Mattermost installation %li 2. = link_to 'Add a slash command', 'https://docs.mattermost.com/developer/slash-commands.html#set-up-a-custom-command' @@ -44,9 +44,9 @@ %p Fill in the word that works best for your team. %p Suggestions: - %code= @project ? @project.name : 'project_name' - %code= @project ? @project.namespace.name : 'namespace_name' - %code= @project ? @project.name_with_namespace : 'namespace_name/project_name' + %code= 'gitlab' + %code= @project.path # Path contains no spaces, but dashes + %code= @project.path_with_namespace .form-group = label_tag :request_url, 'Request URL', class: 'col-sm-2 col-xs-12 control-label' @@ -69,7 +69,7 @@ .form-group = label_tag :response_icon, 'Response icon', class: 'col-sm-2 col-xs-12 control-label' .col-sm-10.col-xs-12.input-group - = text_field_tag :response_icon, asset_path('gitlab_logo.png'), class: 'form-control input-sm', readonly: 'readonly' + = text_field_tag :response_icon, asset_url('gitlab_logo.png'), class: 'form-control input-sm', readonly: 'readonly' .input-group-btn = clipboard_button(clipboard_target: '#response_icon') |