Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
05228ddd
Commit
05228ddd
authored
Dec 29, 2016
by
Z.J. van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename logo, apply for Slack too
parent
b0667332
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
2 deletions
+8
-2
app/controllers/projects/mattermosts_controller.rb
app/controllers/projects/mattermosts_controller.rb
+1
-1
app/views/projects/services/slack_slash_commands/_help.html.haml
...ws/projects/services/slack_slash_commands/_help.html.haml
+1
-1
public/slash-command-logo.png
public/slash-command-logo.png
+0
-0
spec/features/projects/services/mattermost_slash_command_spec.rb
...atures/projects/services/mattermost_slash_command_spec.rb
+6
-0
No files found.
app/controllers/projects/mattermosts_controller.rb
View file @
05228ddd
...
...
@@ -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
...
...
app/views/projects/services/slack_slash_commands/_help.html.haml
View file @
05228ddd
...
...
@@ -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
...
...
public/
mattermost
-command-logo.png
→
public/
slash
-command-logo.png
View file @
05228ddd
File moved
spec/features/projects/services/mattermost_slash_command_spec.rb
View file @
05228ddd
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment