update to rails 4.2.5, clean up

7 files changed, 84 insertions, 84 deletions

diff --git a/db/migrate/02_create_users.rb b/db/migrate/02_create_users.rb
index c8d68ed..1fefaf9 100644
--- a/db/migrate/02_create_users.rb
+++ b/db/migrate/02_create_users.rb
@@ -20,7 +20,7 @@ class CreateUsers < ActiveRecord::Migration
 
       t.references :role, null: false, default: Role.get(:normal)
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end
\ No newline at end of file
diff --git a/db/migrate/03_create_blogposts.rb b/db/migrate/03_create_blogposts.rb
index fd674bb..f530ed1 100644
--- a/db/migrate/03_create_blogposts.rb
+++ b/db/migrate/03_create_blogposts.rb
@@ -7,7 +7,7 @@ class CreateBlogposts < ActiveRecord::Migration
       t.references :user_author
       t.references :user_editor
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end
\ No newline at end of file
diff --git a/db/migrate/04_create_comments.rb b/db/migrate/04_create_comments.rb
index 61b6871..022bae6 100644
--- a/db/migrate/04_create_comments.rb
+++ b/db/migrate/04_create_comments.rb
@@ -7,7 +7,7 @@ class CreateComments < ActiveRecord::Migration
       t.references :user_editor
       t.references :blogpost
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end
diff --git a/db/migrate/07_create_forumthreads.rb b/db/migrate/07_create_forumthreads.rb
index 1f06761..830b5f2 100644
--- a/db/migrate/07_create_forumthreads.rb
+++ b/db/migrate/07_create_forumthreads.rb
@@ -11,7 +11,7 @@ class CreateForumthreads < ActiveRecord::Migration
 
       t.references :forum
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end
diff --git a/db/migrate/08_create_sessions.rb b/db/migrate/08_create_sessions.rb
index b2443e4..8e12ed1 100644
--- a/db/migrate/08_create_sessions.rb
+++ b/db/migrate/08_create_sessions.rb
@@ -3,7 +3,7 @@ class CreateSessions < ActiveRecord::Migration
     create_table :sessions do |t|
       t.string :session_id, :null => false
       t.text :data
-      t.timestamps
+      t.timestamps null: true
     end
 
     add_index :sessions, :session_id
diff --git a/db/migrate/10_create_threadreplies.rb b/db/migrate/10_create_threadreplies.rb
index 97a6626..ff6a810 100644
--- a/db/migrate/10_create_threadreplies.rb
+++ b/db/migrate/10_create_threadreplies.rb
@@ -7,7 +7,7 @@ class CreateThreadreplies < ActiveRecord::Migration
       t.references :user_editor
       t.references :forumthread
 
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index 0f9ed93..586de61 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,89 +11,89 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150826002927) do
+ActiveRecord::Schema.define(version: 20150825232749) do
 
-  create_table "blogposts", force: true do |t|
-    t.string   "title"
-    t.text     "content"
-    t.integer  "user_author_id"
-    t.integer  "user_editor_id"
+  create_table "blogposts", force: :cascade do |t|
+    t.string   "title",          limit: 255
+    t.text     "content",        limit: 65535
+    t.integer  "user_author_id", limit: 4
+    t.integer  "user_editor_id", limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "comments", force: true do |t|
-    t.text     "content"
-    t.integer  "user_author_id"
-    t.integer  "user_editor_id"
-    t.integer  "blogpost_id"
+  create_table "comments", force: :cascade do |t|
+    t.text     "content",        limit: 65535
+    t.integer  "user_author_id", limit: 4
+    t.integer  "user_editor_id", limit: 4
+    t.integer  "blogpost_id",    limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "forumgroups", force: true do |t|
-    t.string  "name"
-    t.integer "position"
-    t.integer "role_read_id"
-    t.integer "role_write_id"
+  create_table "forumgroups", force: :cascade do |t|
+    t.string  "name",          limit: 255
+    t.integer "position",      limit: 4
+    t.integer "role_read_id",  limit: 4
+    t.integer "role_write_id", limit: 4
   end
 
-  create_table "forums", force: true do |t|
-    t.string  "name"
-    t.integer "position"
-    t.integer "role_read_id"
-    t.integer "role_write_id"
-    t.integer "forumgroup_id"
+  create_table "forums", force: :cascade do |t|
+    t.string  "name",          limit: 255
+    t.integer "position",      limit: 4
+    t.integer "role_read_id",  limit: 4
+    t.integer "role_write_id", limit: 4
+    t.integer "forumgroup_id", limit: 4
   end
 
-  create_table "forums_labels", id: false, force: true do |t|
-    t.integer "forum_id"
-    t.integer "label_id"
+  create_table "forums_labels", id: false, force: :cascade do |t|
+    t.integer "forum_id", limit: 4
+    t.integer "label_id", limit: 4
   end
 
-  create_table "forumthreads", force: true do |t|
-    t.string   "title"
-    t.text     "content"
-    t.boolean  "sticky",         default: false
-    t.boolean  "locked",         default: false
-    t.integer  "user_author_id"
-    t.integer  "user_editor_id"
-    t.integer  "forum_id"
+  create_table "forumthreads", force: :cascade do |t|
+    t.string   "title",          limit: 255
+    t.text     "content",        limit: 65535
+    t.boolean  "sticky",                       default: false
+    t.boolean  "locked",                       default: false
+    t.integer  "user_author_id", limit: 4
+    t.integer  "user_editor_id", limit: 4
+    t.integer  "forum_id",       limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "label_id"
+    t.integer  "label_id",       limit: 4
   end
 
-  create_table "info", force: true do |t|
-    t.string   "title"
-    t.text     "content"
+  create_table "info", force: :cascade do |t|
+    t.string   "title",      limit: 255
+    t.text     "content",    limit: 65535
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "labels", force: true do |t|
-    t.string "name"
-    t.string "color"
+  create_table "labels", force: :cascade do |t|
+    t.string "name",  limit: 255
+    t.string "color", limit: 255
   end
 
-  create_table "register_tokens", force: true do |t|
-    t.string "uuid",  limit: 32, null: false
-    t.string "token", limit: 6,  null: false
-    t.string "email",            null: false
+  create_table "register_tokens", force: :cascade do |t|
+    t.string "uuid",  limit: 32,  null: false
+    t.string "token", limit: 6,   null: false
+    t.string "email", limit: 255, null: false
   end
 
   add_index "register_tokens", ["email"], name: "index_register_tokens_on_email", unique: true, using: :btree
   add_index "register_tokens", ["uuid"], name: "index_register_tokens_on_uuid", unique: true, using: :btree
 
-  create_table "roles", force: true do |t|
-    t.string  "name"
-    t.integer "value"
-    t.string  "color"
+  create_table "roles", force: :cascade do |t|
+    t.string  "name",  limit: 255
+    t.integer "value", limit: 4
+    t.string  "color", limit: 255
   end
 
-  create_table "sessions", force: true do |t|
-    t.string   "session_id", null: false
-    t.text     "data"
+  create_table "sessions", force: :cascade do |t|
+    t.string   "session_id", limit: 255,   null: false
+    t.text     "data",       limit: 65535
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -101,40 +101,40 @@ ActiveRecord::Schema.define(version: 20150826002927) do
   add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", using: :btree
   add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at", using: :btree
 
-  create_table "threadreplies", force: true do |t|
-    t.text     "content"
-    t.integer  "user_author_id"
-    t.integer  "user_editor_id"
-    t.integer  "forumthread_id"
+  create_table "threadreplies", force: :cascade do |t|
+    t.text     "content",        limit: 65535
+    t.integer  "user_author_id", limit: 4
+    t.integer  "user_editor_id", limit: 4
+    t.integer  "forumthread_id", limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "users", force: true do |t|
-    t.string   "uuid",                                        null: false
-    t.string   "name",                                        null: false
-    t.string   "password_digest",                             null: false
-    t.string   "ign",                                         null: false
-    t.string   "email",                                       null: false
-    t.text     "about"
-    t.string   "last_ip"
-    t.string   "skype"
-    t.boolean  "skype_public",                default: false
-    t.string   "youtube"
-    t.string   "youtube_channelname"
-    t.string   "twitter"
-    t.boolean  "donor",                       default: false
-    t.string   "email_token"
-    t.boolean  "confirmed",                   default: false
+  create_table "users", force: :cascade do |t|
+    t.string   "uuid",                        limit: 255,                   null: false
+    t.string   "name",                        limit: 255,                   null: false
+    t.string   "password_digest",             limit: 255,                   null: false
+    t.string   "ign",                         limit: 255,                   null: false
+    t.string   "email",                       limit: 255,                   null: false
+    t.text     "about",                       limit: 65535
+    t.string   "last_ip",                     limit: 255
+    t.string   "skype",                       limit: 255
+    t.boolean  "skype_public",                              default: false
+    t.string   "youtube",                     limit: 255
+    t.string   "youtube_channelname",         limit: 255
+    t.string   "twitter",                     limit: 255
+    t.boolean  "donor",                                     default: false
+    t.string   "email_token",                 limit: 255
+    t.boolean  "confirmed",                                 default: false
     t.datetime "last_seen"
-    t.integer  "role_id",                                     null: false
+    t.integer  "role_id",                     limit: 4,                     null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "mail_own_thread_reply",       default: true
-    t.boolean  "mail_other_thread_reply",     default: true
-    t.boolean  "mail_own_blogpost_comment",   default: true
-    t.boolean  "mail_other_blogpost_comment", default: true
-    t.boolean  "mail_mention",                default: true
+    t.boolean  "mail_own_thread_reply",                     default: true
+    t.boolean  "mail_other_thread_reply",                   default: true
+    t.boolean  "mail_own_blogpost_comment",                 default: true
+    t.boolean  "mail_other_blogpost_comment",               default: true
+    t.boolean  "mail_mention",                              default: true
   end
 
   add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree