Commit 05228ddd authored by Z.J. van de Weg's avatar Z.J. van de Weg

Rename logo, apply for Slack too

parent b0667332
...@@ -30,7 +30,7 @@ class Projects::MattermostsController < Projects::ApplicationController ...@@ -30,7 +30,7 @@ class Projects::MattermostsController < Projects::ApplicationController
def configure_params def configure_params
params.require(:mattermost).permit(:trigger, :team_id).merge( params.require(:mattermost).permit(:trigger, :team_id).merge(
url: service_trigger_url(@service), url: service_trigger_url(@service),
icon_url: asset_url('mattermost-command-logo.png')) icon_url: asset_url('slash-command-logo.png'))
end end
def teams def teams
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
.form-group .form-group
= label_tag nil, 'Customize icon', class: 'col-sm-2 col-xs-12 control-label' = label_tag nil, 'Customize icon', class: 'col-sm-2 col-xs-12 control-label'
.col-sm-10.col-xs-12.text-block .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') = link_to('Download image', asset_url('gitlab_logo.png'), class: 'btn btn-sm', target: '_blank')
.form-group .form-group
......
...@@ -49,4 +49,10 @@ feature 'Setup Mattermost slash commands', feature: true do ...@@ -49,4 +49,10 @@ feature 'Setup Mattermost slash commands', feature: true do
end end
end 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 end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment