diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2016-12-29 10:58:27 +0100 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-01-03 15:01:28 +0100 |
| commit | 05228dddffbfe7863e129d8778c83c203d9fd883 (patch) | |
| tree | 303ad6ab7be5cded2073e2158ab749228209a1f7 | |
| parent | b0667332ca260dca54b612f4f0b7f664ff000693 (diff) | |
| download | gitlab-ce-05228dddffbfe7863e129d8778c83c203d9fd883.tar.gz | |
Rename logo, apply for Slack too
| -rw-r--r-- | app/controllers/projects/mattermosts_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/services/slack_slash_commands/_help.html.haml | 2 | ||||
| -rw-r--r-- | public/slash-command-logo.png (renamed from public/mattermost-command-logo.png) | bin | 9509 -> 9509 bytes | |||
| -rw-r--r-- | spec/features/projects/services/mattermost_slash_command_spec.rb | 6 |
4 files changed, 8 insertions, 2 deletions
diff --git a/app/controllers/projects/mattermosts_controller.rb b/app/controllers/projects/mattermosts_controller.rb index bddfa6ebe0f..01d99c7df35 100644 --- a/app/controllers/projects/mattermosts_controller.rb +++ b/app/controllers/projects/mattermosts_controller.rb @@ -30,7 +30,7 @@ class Projects::MattermostsController < Projects::ApplicationController def configure_params params.require(:mattermost).permit(:trigger, :team_id).merge( url: service_trigger_url(@service), - icon_url: asset_url('mattermost-command-logo.png')) + icon_url: asset_url('slash-command-logo.png')) end def teams 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 c45052e3954..6d7c2defe2b 100644 --- a/app/views/projects/services/slack_slash_commands/_help.html.haml +++ b/app/views/projects/services/slack_slash_commands/_help.html.haml @@ -50,7 +50,7 @@ .form-group = label_tag nil, 'Customize icon', class: 'col-sm-2 col-xs-12 control-label' .col-sm-10.col-xs-12.text-block - = image_tag(asset_url('gitlab_logo.png'), width: 36, height: 36) + = image_tag(asset_url('slash-command-logo.png'), width: 36, height: 36) = link_to('Download image', asset_url('gitlab_logo.png'), class: 'btn btn-sm', target: '_blank') .form-group diff --git a/public/mattermost-command-logo.png b/public/slash-command-logo.png Binary files differindex 05c8b0d0ccf..05c8b0d0ccf 100644 --- a/public/mattermost-command-logo.png +++ b/public/slash-command-logo.png diff --git a/spec/features/projects/services/mattermost_slash_command_spec.rb b/spec/features/projects/services/mattermost_slash_command_spec.rb index 274d50e7ce4..8de827447ff 100644 --- a/spec/features/projects/services/mattermost_slash_command_spec.rb +++ b/spec/features/projects/services/mattermost_slash_command_spec.rb @@ -49,4 +49,10 @@ feature 'Setup Mattermost slash commands', feature: true do end end end + + describe 'stable logo url' do + it 'shows a publicly available logo' do + expect(File.exist?(Rails.root.join('public/slash-command-logo.png'))) + end + end end |
