diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 9165565d8fd417d4b8f6278a672222069d223541..250ae496b064e052db715e341b2c325dc4c9a809 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -70,7 +70,7 @@ module Ci
         pipeline.update_duration
       end
 
-      before_transition :canceled => any - [:canceled] do |pipeline|
+      before_transition canceled: any - [:canceled] do |pipeline|
         pipeline.auto_canceled_by = nil
       end
 
diff --git a/db/migrate/20170402231018_remove_index_for_users_current_sign_in_at.rb b/db/migrate/20170402231018_remove_index_for_users_current_sign_in_at.rb
index 8316ee9eb9fb1cfb996a2f797edfc5618c6d1024..6013598b835f9c2857d302383c57268ba50e7f06 100644
--- a/db/migrate/20170402231018_remove_index_for_users_current_sign_in_at.rb
+++ b/db/migrate/20170402231018_remove_index_for_users_current_sign_in_at.rb
@@ -14,7 +14,7 @@ class RemoveIndexForUsersCurrentSignInAt < ActiveRecord::Migration
       if Gitlab::Database.postgresql?
         execute 'DROP INDEX CONCURRENTLY index_users_on_current_sign_in_at;'
       else
-        remove_index :users, :current_sign_in_at
+        remove_concurrent_index :users, :current_sign_in_at
       end
     end
   end