Merge branch 'clean'

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/show.json.jbuilder
	db/migrate/20140306014123_add_index_to_users_email.rb
	db/migrate/20140306014125_add_index_to_users_user_name.rb
	db/migrate/20140306014128_add_password_digest_to_users.rb
	db/migrate/20140306014130_add_remember_token_to_users.rb
	db/schema.rb

19 files changed, 7 insertions, 32 deletions

diff --git a/db/migrate/20140306014123_add_index_to_users_email.rb b/db/migrate/20140306014123_add_index_to_users_email.rb
deleted file mode 100644
index 934d23b..0000000
--- a/db/migrate/20140306014123_add_index_to_users_email.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class AddIndexToUsersEmail < ActiveRecord::Migration
-
-# adding unique: true ensures there can be no duplicates
-  def change
-	add_index :users, :email, unique: true
-  end
-
-end
diff --git a/db/migrate/20140306014125_add_index_to_users_user_name.rb b/db/migrate/20140306014125_add_index_to_users_user_name.rb
deleted file mode 100644
index 22ca8c3..0000000
--- a/db/migrate/20140306014125_add_index_to_users_user_name.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class AddIndexToUsersUserName < ActiveRecord::Migration
- 
-# ensures that the username is unique
-  def change
-	add_index :users, :user_name, unique: true
-  end
-end
diff --git a/db/migrate/20140306014128_add_password_digest_to_users.rb b/db/migrate/20140306014128_add_password_digest_to_users.rb
deleted file mode 100644
index 7ad1f62..0000000
--- a/db/migrate/20140306014128_add_password_digest_to_users.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddPasswordDigestToUsers < ActiveRecord::Migration
-  def change
-    add_column :users, :password_digest, :string
-  end
-end
diff --git a/db/migrate/20140306014130_add_remember_token_to_users.rb b/db/migrate/20140306014130_add_remember_token_to_users.rb
deleted file mode 100644
index 6d84942..0000000
--- a/db/migrate/20140306014130_add_remember_token_to_users.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class AddRememberTokenToUsers < ActiveRecord::Migration
-	#add a remember me token to the database
-	#this keeps a user signed in until they sign out
-  def change
-		add_column :users, :remember_token, :string
-		add_index :users, :remember_token
-  end
-end
diff --git a/db/migrate/20140306014047_create_servers.rb b/db/migrate/20140306022626_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140306014047_create_servers.rb
+++ b/db/migrate/20140306022626_create_servers.rb
diff --git a/db/migrate/20140306014050_create_tournaments.rb b/db/migrate/20140306022628_create_tournaments.rb
index 36fcf7e..36fcf7e 100644
--- a/db/migrate/20140306014050_create_tournaments.rb
+++ b/db/migrate/20140306022628_create_tournaments.rb
diff --git a/db/migrate/20140306014052_create_matches.rb b/db/migrate/20140306022631_create_matches.rb
index 325863d..325863d 100644
--- a/db/migrate/20140306014052_create_matches.rb
+++ b/db/migrate/20140306022631_create_matches.rb
diff --git a/db/migrate/20140306014054_create_teams.rb b/db/migrate/20140306022633_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140306014054_create_teams.rb
+++ b/db/migrate/20140306022633_create_teams.rb
diff --git a/db/migrate/20140306014056_create_alerts.rb b/db/migrate/20140306022635_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140306014056_create_alerts.rb
+++ b/db/migrate/20140306022635_create_alerts.rb
diff --git a/db/migrate/20140306014059_create_pms.rb b/db/migrate/20140306022638_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140306014059_create_pms.rb
+++ b/db/migrate/20140306022638_create_pms.rb
diff --git a/db/migrate/20140306014101_create_games.rb b/db/migrate/20140306022640_create_games.rb
index 59d4ef0..59d4ef0 100644
--- a/db/migrate/20140306014101_create_games.rb
+++ b/db/migrate/20140306022640_create_games.rb
diff --git a/db/migrate/20140306014103_create_users.rb b/db/migrate/20140306022642_create_users.rb
index f0986d4..f416771 100644
--- a/db/migrate/20140306014103_create_users.rb
+++ b/db/migrate/20140306022642_create_users.rb
@@ -4,8 +4,12 @@ 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
+    add_index :users, :email, unique: true
+    add_index :users, :user_name, unique: true
   end
 end
diff --git a/db/migrate/20140306014106_create_sessions.rb b/db/migrate/20140306022644_create_sessions.rb
index fe25bf2..fe25bf2 100644
--- a/db/migrate/20140306014106_create_sessions.rb
+++ b/db/migrate/20140306022644_create_sessions.rb
diff --git a/db/migrate/20140306014108_create_game_attributes.rb b/db/migrate/20140306022647_create_game_attributes.rb
index b63f134..b63f134 100644
--- a/db/migrate/20140306014108_create_game_attributes.rb
+++ b/db/migrate/20140306022647_create_game_attributes.rb
diff --git a/db/migrate/20140306014110_create_server_settings.rb b/db/migrate/20140306022649_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140306014110_create_server_settings.rb
+++ b/db/migrate/20140306022649_create_server_settings.rb
diff --git a/db/migrate/20140306014112_create_user_team_pairs.rb b/db/migrate/20140306022651_create_user_team_pairs.rb
index 2c492ac..2c492ac 100644
--- a/db/migrate/20140306014112_create_user_team_pairs.rb
+++ b/db/migrate/20140306022651_create_user_team_pairs.rb
diff --git a/db/migrate/20140306014114_create_team_match_pairs.rb b/db/migrate/20140306022653_create_team_match_pairs.rb
index 8fac07e..8fac07e 100644
--- a/db/migrate/20140306014114_create_team_match_pairs.rb
+++ b/db/migrate/20140306022653_create_team_match_pairs.rb
diff --git a/db/migrate/20140306014132_create_tournament_options.rb b/db/migrate/20140306022702_create_tournament_options.rb
index d2df22e..d2df22e 100644
--- a/db/migrate/20140306014132_create_tournament_options.rb
+++ b/db/migrate/20140306022702_create_tournament_options.rb
diff --git a/db/schema.rb b/db/schema.rb
index f2e9136..ca583d1 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: 20140306014132) do
+ActiveRecord::Schema.define(version: 20140306022702) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -122,14 +122,13 @@ ActiveRecord::Schema.define(version: 20140306014132) do
     t.string   "name"
     t.string   "email"
     t.string   "user_name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
     t.string   "password_digest"
     t.string   "remember_token"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   add_index "users", ["email"], name: "index_users_on_email", unique: true
-  add_index "users", ["remember_token"], name: "index_users_on_remember_token"
   add_index "users", ["user_name"], name: "index_users_on_user_name", unique: true
 
 end