summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorjomo <github@jomo.tv>2014-04-28 03:01:33 +0200
committerjomo <github@jomo.tv>2014-04-28 03:01:33 +0200
commit65f5adf65d2cf95bc5b6c06f47cc4d4f860cc7eb (patch)
treef36397378e7527f822a0856e0c83c0ec4bd1d55d /db
parenta6ba503e735fc32028bd9b48f2eeaada86842546 (diff)
a TON of bugfixes and new features
Diffstat (limited to 'db')
-rw-r--r--db/migrate/02_create_users.rb2
-rw-r--r--db/schema.rb6
-rw-r--r--db/seeds.rb2
3 files changed, 5 insertions, 5 deletions
diff --git a/db/migrate/02_create_users.rb b/db/migrate/02_create_users.rb
index bb1a012..08bbce7 100644
--- a/db/migrate/02_create_users.rb
+++ b/db/migrate/02_create_users.rb
@@ -18,7 +18,7 @@ class CreateUsers < ActiveRecord::Migration
t.boolean :confirmed, default: false
t.datetime :last_seen
- t.references :role, null: false
+ t.references :role, null: false, default: Role.get(:normal)
t.timestamps
end
diff --git a/db/schema.rb b/db/schema.rb
index f666e1a..3ea2027 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -109,9 +109,9 @@ ActiveRecord::Schema.define(version: 11) do
t.string "email_token"
t.boolean "confirmed", default: false
t.datetime "last_seen"
- t.integer "role_id", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.integer "role_id", default: 3, null: false
+ t.datetime "created_at"
+ t.datetime "updated_at"
end
end
diff --git a/db/seeds.rb b/db/seeds.rb
index 40d358b..8db2ce9 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -18,7 +18,7 @@ deleted_user = User.create!(
uuid: "8667ba71b85a4004af54457a9734eed7",
name: "Deleted user",
email: "redstonerserver@gmail.com",
- ign: "Steve",
+ ign: "Notch", # just need any valid ign here, overriding later
about: "Hey, apparently, I do no longer exist. This is just a placeholder profile",
password: userpw,
password_confirmation: userpw,