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

[rails.git] / db / migrate / 045_create_user_blocks.rb

diff --git a/db/migrate/045_create_user_blocks.rb b/db/migrate/045_create_user_blocks.rb
index cdb36cd15c8a5deda07a36fdc827fe03a9c05dc8..4328e0b97315a8cf8a66e6ec70b04b7e9d57b68c 100644 (file)
--- a/db/migrate/045_create_user_blocks.rb
+++ b/db/migrate/045_create_user_blocks.rb
@@ -1,6 +1,4 @@
-require "migrate"
-
-class CreateUserBlocks < ActiveRecord::Migration
+class CreateUserBlocks < ActiveRecord::Migration[4.2]

   def change
     create_table :user_blocks do |t|
       t.column :user_id,      :bigint,   :null => false
   def change
     create_table :user_blocks do |t|
       t.column :user_id,      :bigint,   :null => false


@@ -10,7 +8,7 @@ class CreateUserBlocks < ActiveRecord::Migration
       t.column :needs_view,   :boolean,  :null => false, :default => false
       t.column :revoker_id,   :bigint
 
       t.column :needs_view,   :boolean,  :null => false, :default => false
       t.column :revoker_id,   :bigint
 

-      t.timestamps
+      t.timestamps :null => true

     end
 
     add_foreign_key :user_blocks, :users, :name => "user_blocks_user_id_fkey"
     end
 
     add_foreign_key :user_blocks, :users, :name => "user_blocks_user_id_fkey"