Merge branch 'wheres_this' of https://github.com/pnorman/openstreetmap-website into...

[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 b5e43940628620c264a1c30237d48f893ce907ca..3a3fa3faf1520f0311513a552735761874cd5bcd 100644 (file)
--- a/db/migrate/044_create_user_roles.rb
+++ b/db/migrate/044_create_user_roles.rb
@@ -1,14 +1,14 @@
 require "migrate"
 
-class CreateUserRoles < ActiveRecord::Migration
+class CreateUserRoles < ActiveRecord::Migration[5.0]
   def self.up
-    create_enumeration :user_role_enum, %w(administrator moderator)
+    create_enumeration :user_role_enum, %w[administrator moderator]
 
     create_table :user_roles do |t|
       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|