Merge branch 'clean'

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/index.html.erb

16 files changed, 13 insertions, 5 deletions

diff --git a/db/migrate/20140306022626_create_servers.rb b/db/migrate/20140306024707_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140306022626_create_servers.rb
+++ b/db/migrate/20140306024707_create_servers.rb
diff --git a/db/migrate/20140306022628_create_tournaments.rb b/db/migrate/20140306024709_create_tournaments.rb
index 36fcf7e..36fcf7e 100644
--- a/db/migrate/20140306022628_create_tournaments.rb
+++ b/db/migrate/20140306024709_create_tournaments.rb
diff --git a/db/migrate/20140306022631_create_matches.rb b/db/migrate/20140306024711_create_matches.rb
index 325863d..325863d 100644
--- a/db/migrate/20140306022631_create_matches.rb
+++ b/db/migrate/20140306024711_create_matches.rb
diff --git a/db/migrate/20140306022633_create_teams.rb b/db/migrate/20140306024713_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140306022633_create_teams.rb
+++ b/db/migrate/20140306024713_create_teams.rb
diff --git a/db/migrate/20140306022635_create_alerts.rb b/db/migrate/20140306024715_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140306022635_create_alerts.rb
+++ b/db/migrate/20140306024715_create_alerts.rb
diff --git a/db/migrate/20140306022638_create_pms.rb b/db/migrate/20140306024718_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140306022638_create_pms.rb
+++ b/db/migrate/20140306024718_create_pms.rb
diff --git a/db/migrate/20140306022640_create_games.rb b/db/migrate/20140306024720_create_games.rb
index 59d4ef0..59d4ef0 100644
--- a/db/migrate/20140306022640_create_games.rb
+++ b/db/migrate/20140306024720_create_games.rb
diff --git a/db/migrate/20140306022642_create_users.rb b/db/migrate/20140306024722_create_users.rb
index f416771..8032870 100644
--- a/db/migrate/20140306022642_create_users.rb
+++ b/db/migrate/20140306024722_create_users.rb
@@ -4,8 +4,6 @@ class CreateUsers < ActiveRecord::Migration
       t.string :name
       t.string :email
       t.string :user_name
-      t.string :password_digest
-      t.string :remember_token
 
       t.timestamps
     end
diff --git a/db/migrate/20140306022644_create_sessions.rb b/db/migrate/20140306024724_create_sessions.rb
index fe25bf2..fe25bf2 100644
--- a/db/migrate/20140306022644_create_sessions.rb
+++ b/db/migrate/20140306024724_create_sessions.rb
diff --git a/db/migrate/20140306022647_create_game_attributes.rb b/db/migrate/20140306024727_create_game_attributes.rb
index b63f134..b63f134 100644
--- a/db/migrate/20140306022647_create_game_attributes.rb
+++ b/db/migrate/20140306024727_create_game_attributes.rb
diff --git a/db/migrate/20140306022649_create_server_settings.rb b/db/migrate/20140306024729_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140306022649_create_server_settings.rb
+++ b/db/migrate/20140306024729_create_server_settings.rb
diff --git a/db/migrate/20140306022651_create_user_team_pairs.rb b/db/migrate/20140306024731_create_user_team_pairs.rb
index 2c492ac..2c492ac 100644
--- a/db/migrate/20140306022651_create_user_team_pairs.rb
+++ b/db/migrate/20140306024731_create_user_team_pairs.rb
diff --git a/db/migrate/20140306022653_create_team_match_pairs.rb b/db/migrate/20140306024733_create_team_match_pairs.rb
index 8fac07e..8fac07e 100644
--- a/db/migrate/20140306022653_create_team_match_pairs.rb
+++ b/db/migrate/20140306024733_create_team_match_pairs.rb
diff --git a/db/migrate/20140306022702_create_tournament_options.rb b/db/migrate/20140306024735_create_tournament_options.rb
index d2df22e..d2df22e 100644
--- a/db/migrate/20140306022702_create_tournament_options.rb
+++ b/db/migrate/20140306024735_create_tournament_options.rb
diff --git a/db/migrate/20140306024744_add_hidden_attrs_to_user.rb b/db/migrate/20140306024744_add_hidden_attrs_to_user.rb
new file mode 100644
index 0000000..2f1b0b2
--- /dev/null
+++ b/db/migrate/20140306024744_add_hidden_attrs_to_user.rb
@@ -0,0 +1,8 @@
+class AddHiddenAttrsToUser < ActiveRecord::Migration
+  def change
+    add_column :users, :password_digest, :string
+    add_column :users, :remember_token, :string
+    add_index :users, :remember_token, unique: true
+    add_column :users, :groups, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ca583d1..b0d0766 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140306022702) do
+ActiveRecord::Schema.define(version: 20140306024744) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -122,13 +122,15 @@ ActiveRecord::Schema.define(version: 20140306022702) do
     t.string   "name"
     t.string   "email"
     t.string   "user_name"
-    t.string   "password_digest"
-    t.string   "remember_token"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "password_digest"
+    t.string   "remember_token"
+    t.integer  "groups"
   end
 
   add_index "users", ["email"], name: "index_users_on_email", unique: true
+  add_index "users", ["remember_token"], name: "index_users_on_remember_token", unique: true
   add_index "users", ["user_name"], name: "index_users_on_user_name", unique: true
 
 end