summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-12-20 00:29:38 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2016-12-20 00:29:38 +0100
commitf7b7e918fef6567d26e7fe17894e5df14c58f37c (patch)
tree31f20766632c8ae4c78ea01ad90b3ed99834d2fd
parent841960f847f04da9c427bcdb19037e2112a90890 (diff)
downloadgitlab-ce-f7b7e918fef6567d26e7fe17894e5df14c58f37c.tar.gz
Remove rest of the form parameters as we can't really support them
-rw-r--r--app/views/projects/services/mattermost_slash_commands/_help.html.haml7
-rw-r--r--app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml12
2 files changed, 5 insertions, 14 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 7ed291e09db..63b797cd391 100644
--- a/app/views/projects/services/mattermost_slash_commands/_help.html.haml
+++ b/app/views/projects/services/mattermost_slash_commands/_help.html.haml
@@ -7,6 +7,9 @@
See list of available commands in Mattermost after setting up this service,
by entering
%code /&lt;command_trigger_word&gt; help
- = render 'projects/services/mattermost_slash_commands/detailed_help', subject: @service unless enabled
-= render 'projects/services/mattermost_slash_commands/installation_info' if enabled
+ - unless enabled
+ = render 'projects/services/mattermost_slash_commands/detailed_help', subject: @service
+
+- if enabled
+ = render 'projects/services/mattermost_slash_commands/installation_info', subject: @service
diff --git a/app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml b/app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml
index e6fcb09e054..c929eee3bb9 100644
--- a/app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml
+++ b/app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml
@@ -1,18 +1,6 @@
.services-installation-info
- .row
- %strong.col-sm-3.text-right Status
- .col-sm-9= @service.activated? ? 'Installed' : 'Not installed'
- .row
- %strong.col-sm-3.text-right Mattermost
- = link_to pretty_url(Gitlab.config.mattermost.host), Gitlab.config.mattermost.host, class: 'col-sm-9', target: '__blank'
- unless @service.activated?
.row
- %strong.col-sm-3.text-right Installation
- .col-sm-9
- To install this service, press
- %strong Add to Mattermost
- and follow the instructions
- .row
.col-sm-9.col-sm-offset-3
= link_to new_namespace_project_mattermost_path(@project.namespace, @project), class: 'btn btn-lg' do
= custom_icon('mattermost_logo', size: 15)