Fix broken specs

5 files changed, 21 insertions, 20 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 2a1b9d4c465..c1e576b42fc 100644
--- a/app/views/projects/services/mattermost_slash_commands/_help.html.haml
+++ b/app/views/projects/services/mattermost_slash_commands/_help.html.haml
@@ -1,16 +1,13 @@
 - enabled = Gitlab.config.mattermost.enabled
 
 .well
-  %p
-    This service allows users to perform common operations on this
-    project by entering slash commands in Mattermost.
-    = link_to help_page_path('user/project/integrations/mattermost_slash_commands.md'), target: '_blank' do
-      View documentation
-      = icon('external-link')
-  %p.inline
-    See list of available commands in Mattermost after setting up this service,
-    by entering
-  %kbd.inline /<trigger> help
+  This service allows GitLab users to perform common operations on this
+  project by entering slash commands in Mattermost.
+  %br
+  See list of available commands in Mattermost after setting up this service,
+  by entering
+  %code /<command_trigger_word> help
+
   - unless enabled || @service.template?
     = render 'projects/services/mattermost_slash_commands/detailed_help', subject: @service
 
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 a453d1f7974..4ac6a52d6e8 100644
--- a/app/views/projects/services/slack_slash_commands/_help.html.haml
+++ b/app/views/projects/services/slack_slash_commands/_help.html.haml
@@ -2,16 +2,14 @@
 - run_actions_text = "Perform common operations on this project: #{pretty_name}"
 
 .well
-  %p
-    This service allows users to perform common operations on this
-    project by entering slash commands in Slack.
-    = link_to help_page_path('user/project/integrations/slack_slash_commands.md'), target: '_blank' do
-      View documentation
-      = icon('external-link')
-  %p.inline
-    See list of available commands in Slack after setting up this service,
-    by entering
-  %kbd.inline /<command> help
+  This service allows GitLab users to perform common operations on this
+  project by entering slash commands in Slack.
+  %br
+  See list of available commands in Slack after setting up this service,
+  by entering
+  %code /<command> help
+  %br
+  %br
   - unless @service.template?
     To setup this service:
     %ul.list-unstyled
diff --git a/db/migrate/20160615142710_add_index_on_requested_at_to_members.rb b/db/migrate/20160615142710_add_index_on_requested_at_to_members.rb
index 63f7392e54f..eb271f2e18d 100644
--- a/db/migrate/20160615142710_add_index_on_requested_at_to_members.rb
+++ b/db/migrate/20160615142710_add_index_on_requested_at_to_members.rb
@@ -1,4 +1,6 @@
 class AddIndexOnRequestedAtToMembers < ActiveRecord::Migration
+  DOWNTIME = false
+
   include Gitlab::Database::MigrationHelpers
 
   disable_ddl_transaction!
diff --git a/db/migrate/20160620115026_add_index_on_runners_locked.rb b/db/migrate/20160620115026_add_index_on_runners_locked.rb
index dfa5110dea4..30cc40247a6 100644
--- a/db/migrate/20160620115026_add_index_on_runners_locked.rb
+++ b/db/migrate/20160620115026_add_index_on_runners_locked.rb
@@ -2,6 +2,8 @@
 # for more information on how to write migrations for GitLab.
 
 class AddIndexOnRunnersLocked < ActiveRecord::Migration
+  DOWNTIME = false
+
   include Gitlab::Database::MigrationHelpers
 
   disable_ddl_transaction!
diff --git a/db/migrate/20160715134306_add_index_for_pipeline_user_id.rb b/db/migrate/20160715134306_add_index_for_pipeline_user_id.rb
index 7c991c6d998..b251038b2fb 100644
--- a/db/migrate/20160715134306_add_index_for_pipeline_user_id.rb
+++ b/db/migrate/20160715134306_add_index_for_pipeline_user_id.rb
@@ -1,4 +1,6 @@
 class AddIndexForPipelineUserId < ActiveRecord::Migration
+  DOWNTIME = false
+
   include Gitlab::Database::MigrationHelpers
 
   disable_ddl_transaction!