Merge branch 'slack_app_fixes' into 'master'

Show Slack button when there is no team added

See merge request !2381

app/views/projects/services/gitlab_slack_application/_help.html.haml

@@ -13,5 +13,4 @@
     by entering
   %kbd.inline /gitlab help
   - unless @service.template?
-    %p To set up this service press "Add to Slack"
     = render "projects/services/#{@service.to_param}/slack_integration_form"

app/views/projects/services/gitlab_slack_application/_slack_integration_form.html.haml

-= render "projects/services/#{@service.to_param}/slack_button"
 - slack_integration = @service.slack_integration
 - if slack_integration
   %table.table
@@ -26,3 +25,6 @@
           - project = @service.project
           = link_to 'Edit', edit_project_settings_slack_path(project), class: 'btn btn-sm'
           = link_to 'Remove', project_settings_slack_path(project), method: :delete, class: 'btn btn-danger btn-sm', data: { confirm: 'Are you sure?' }
+- else
+  %p To set up this service press "Add to Slack"
+  = render "projects/services/#{@service.to_param}/slack_button"