Merge branch 'master' into moderation

[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 26b2adf6fdbf4b67eb71dcf8f50d85ac2ddfecf9..e5cf07cd335a67c48c24f10c0b3fc265a21bfc15 100644 (file)
--- a/db/migrate/044_create_user_roles.rb
+++ b/db/migrate/044_create_user_roles.rb
@@ -1,14 +1,14 @@
-require 'migrate'
+require "migrate"
 
 class CreateUserRoles < ActiveRecord::Migration
   def self.up
-    create_enumeration :user_role_enum, ["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|