Merge remote-tracking branch 'upstream/pull/2574'

[rails.git] / db / migrate / 004_user_enhancements.rb

diff --git a/db/migrate/004_user_enhancements.rb b/db/migrate/004_user_enhancements.rb
index 4d53d038296eb5f3351d78dc68b00c600de50eae..d12b02c0a9ffa7b23c30483733e3dcbc8dd8f47b 100644 (file)
--- a/db/migrate/004_user_enhancements.rb
+++ b/db/migrate/004_user_enhancements.rb
@@ -1,6 +1,6 @@
 require "migrate"
 
-class UserEnhancements < ActiveRecord::Migration
+class UserEnhancements < ActiveRecord::Migration[4.2]
   def self.up
     add_column "diary_entries", "latitude", :float, :limit => 53
     add_column "diary_entries", "longitude", :float, :limit => 53
@@ -12,7 +12,7 @@ class UserEnhancements < ActiveRecord::Migration
       t.column "v", :string, :null => false
     end
 
-    add_primary_key "user_preferences", %w(user_id k)
+    add_primary_key "user_preferences", %w[user_id k]
 
     create_table "user_tokens", :id => false do |t|
       t.column "id", :bigserial, :primary_key => true, :null => false