Merge remote-tracking branch 'openstreetmap/pull/954'

[rails.git] / db / migrate / 044_create_user_roles.rb

diff --git a/db/migrate/044_create_user_roles.rb b/db/migrate/044_create_user_roles.rb
index bd7ac41afc860877350db1167d3cc09ff6bdc9c8..bae5a3cadb62254a9241b1f16f3e3544f141705d 100644 (file)
--- a/db/migrate/044_create_user_roles.rb
+++ b/db/migrate/044_create_user_roles.rb
@@ -1,4 +1,4 @@
-require 'migrate'
+require "migrate"

 
 class CreateUserRoles < ActiveRecord::Migration
   def self.up
 
 class CreateUserRoles < ActiveRecord::Migration
   def self.up


@@ -8,7 +8,7 @@ class CreateUserRoles < ActiveRecord::Migration
       t.column :user_id, :bigint, :null => false
       t.column :role, :user_role_enum, :null => false
 
       t.column :user_id, :bigint, :null => false
       t.column :role, :user_role_enum, :null => false
 

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

     end
 
     User.where(:administrator => true).each do |user|
     end
 
     User.where(:administrator => true).each do |user|