Another round of code review

2 files changed, 10 insertions, 4 deletions

diff --git a/db/migrate/20170407140450_add_index_to_next_run_at_and_active.rb b/db/migrate/20170407140450_add_index_to_next_run_at_and_active.rb
index 887632da20e..e1382318d3c 100644
--- a/db/migrate/20170407140450_add_index_to_next_run_at_and_active.rb
+++ b/db/migrate/20170407140450_add_index_to_next_run_at_and_active.rb
@@ -6,7 +6,13 @@ class AddIndexToNextRunAtAndActive < ActiveRecord::Migration
 
   DOWNTIME = false
 
-  def change
-    add_index :ci_trigger_schedules, [:active, :next_run_at]
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :ci_trigger_schedules, [:active, :next_run_at]
+  end
+
+  def down
+    remove_index :ci_trigger_schedules, [:active, :next_run_at]
   end
 end
diff --git a/spec/features/triggers_spec.rb b/spec/features/triggers_spec.rb
index 906842583e4..da7535979a2 100644
--- a/spec/features/triggers_spec.rb
+++ b/spec/features/triggers_spec.rb
@@ -106,7 +106,7 @@ feature 'Triggers', feature: true, js: true do
         end
       end
 
-      context 'enabling schedule' do
+      context 'disabling schedule' do
         before do
           trigger.create_trigger_schedule(project: trigger.project, active: true)
 
@@ -120,7 +120,7 @@ feature 'Triggers', feature: true, js: true do
 
           visit edit_namespace_project_trigger_path(@project.namespace, @project, trigger)
           checkbox = find_field('trigger_trigger_schedule_attributes_active')
-          
+
           expect(checkbox).not_to be_checked
         end
       end