Merge branch 'clean4'

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	app/assets/stylesheets/static.css.scss
	app/controllers/sessions_controller.rb
	app/controllers/static_controller.rb
	app/controllers/tournaments_controller.rb
	app/controllers/users_controller.rb
	app/helpers/sessions_helper.rb
	app/models/game.rb
	app/models/user.rb
	app/views/games/index.html.erb
	app/views/tournaments/index.html.erb
	app/views/tournaments/new.html.erb
	app/views/users/_form.html.erb
	app/views/users/index.html.erb
	app/views/users/index.json.jbuilder
	app/views/users/new.html.erb
	app/views/users/show.html.erb
	app/views/users/show.json.jbuilder
	config/routes.rb
	generate.sh

14 files changed, 124 insertions, 1 deletions

diff --git a/db/migrate/20140220221228_create_servers.rb b/db/migrate/20140304031800_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140220221228_create_servers.rb
+++ b/db/migrate/20140304031800_create_servers.rb
diff --git a/db/migrate/20140220221232_create_tournaments.rb b/db/migrate/20140304031802_create_tournaments.rb
index 2095590..36fcf7e 100644
--- a/db/migrate/20140220221232_create_tournaments.rb
+++ b/db/migrate/20140304031802_create_tournaments.rb
@@ -1,6 +1,7 @@
 class CreateTournaments < ActiveRecord::Migration
   def change
     create_table :tournaments do |t|
+      t.references :game, index: true
 
       t.timestamps
     end
diff --git a/db/migrate/20140220221236_create_matches.rb b/db/migrate/20140304031804_create_matches.rb
index 6c0c157..325863d 100644
--- a/db/migrate/20140220221236_create_matches.rb
+++ b/db/migrate/20140304031804_create_matches.rb
@@ -2,6 +2,7 @@ class CreateMatches < ActiveRecord::Migration
   def change
     create_table :matches do |t|
       t.references :tournament, index: true
+      t.string :name
 
       t.timestamps
     end
diff --git a/db/migrate/20140220221239_create_teams.rb b/db/migrate/20140304031806_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140220221239_create_teams.rb
+++ b/db/migrate/20140304031806_create_teams.rb
diff --git a/db/migrate/20140220221254_create_alerts.rb b/db/migrate/20140304031808_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140220221254_create_alerts.rb
+++ b/db/migrate/20140304031808_create_alerts.rb
diff --git a/db/migrate/20140220221257_create_pms.rb b/db/migrate/20140304031810_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140220221257_create_pms.rb
+++ b/db/migrate/20140304031810_create_pms.rb
diff --git a/db/migrate/20140228014045_create_games.rb b/db/migrate/20140304031813_create_games.rb
index 59d4ef0..59d4ef0 100644
--- a/db/migrate/20140228014045_create_games.rb
+++ b/db/migrate/20140304031813_create_games.rb
diff --git a/db/migrate/20140228164606_create_users.rb b/db/migrate/20140304031815_create_users.rb
index 1c37f38..f0986d4 100644
--- a/db/migrate/20140228164606_create_users.rb
+++ b/db/migrate/20140304031815_create_users.rb
@@ -3,7 +3,7 @@ class CreateUsers < ActiveRecord::Migration
     create_table :users do |t|
       t.string :name
       t.string :email
-	  t.string :user_name
+      t.string :user_name
 
       t.timestamps
     end
diff --git a/db/migrate/20140228014552_create_game_attributes.rb b/db/migrate/20140304031817_create_game_attributes.rb
index b63f134..b63f134 100644
--- a/db/migrate/20140228014552_create_game_attributes.rb
+++ b/db/migrate/20140304031817_create_game_attributes.rb
diff --git a/db/migrate/20140220221301_create_server_settings.rb b/db/migrate/20140304031819_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140220221301_create_server_settings.rb
+++ b/db/migrate/20140304031819_create_server_settings.rb
diff --git a/db/migrate/20140220221247_create_user_team_pairs.rb b/db/migrate/20140304031821_create_user_team_pairs.rb
index 2c492ac..2c492ac 100644
--- a/db/migrate/20140220221247_create_user_team_pairs.rb
+++ b/db/migrate/20140304031821_create_user_team_pairs.rb
diff --git a/db/migrate/20140220221250_create_team_match_pairs.rb b/db/migrate/20140304031823_create_team_match_pairs.rb
index 8fac07e..8fac07e 100644
--- a/db/migrate/20140220221250_create_team_match_pairs.rb
+++ b/db/migrate/20140304031823_create_team_match_pairs.rb
diff --git a/db/migrate/20140228014607_create_tournament_options.rb b/db/migrate/20140304031834_create_tournament_options.rb
index d2df22e..d2df22e 100644
--- a/db/migrate/20140228014607_create_tournament_options.rb
+++ b/db/migrate/20140304031834_create_tournament_options.rb
diff --git a/db/schema.rb b/db/schema.rb
new file mode 100644
index 0000000..a9bd57b
--- /dev/null
+++ b/db/schema.rb
@@ -0,0 +1,121 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20140304031834) do
+
+  create_table "alerts", force: true do |t|
+    t.integer  "author_id"
+    t.text     "message"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "alerts", ["author_id"], name: "index_alerts_on_author_id"
+
+  create_table "game_attributes", force: true do |t|
+    t.integer  "game_id"
+    t.text     "key"
+    t.integer  "type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "game_attributes", ["game_id"], name: "index_game_attributes_on_game_id"
+
+  create_table "games", force: true do |t|
+    t.text     "name"
+    t.integer  "players_per_team"
+    t.integer  "teams_per_match"
+    t.integer  "set_rounds"
+    t.integer  "randomized_teams"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "matches", force: true do |t|
+    t.integer  "tournament_id"
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "matches", ["tournament_id"], name: "index_matches_on_tournament_id"
+
+  create_table "pms", force: true do |t|
+    t.integer  "author_id"
+    t.integer  "recipient_id"
+    t.text     "message"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "pms", ["author_id"], name: "index_pms_on_author_id"
+  add_index "pms", ["recipient_id"], name: "index_pms_on_recipient_id"
+
+  create_table "server_settings", force: true do |t|
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "servers", force: true do |t|
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "team_match_pairs", force: true do |t|
+    t.integer  "team_id"
+    t.integer  "match_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "team_match_pairs", ["match_id"], name: "index_team_match_pairs_on_match_id"
+  add_index "team_match_pairs", ["team_id"], name: "index_team_match_pairs_on_team_id"
+
+  create_table "teams", force: true do |t|
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "tournament_options", force: true do |t|
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "tournaments", force: true do |t|
+    t.integer  "game_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "tournaments", ["game_id"], name: "index_tournaments_on_game_id"
+
+  create_table "user_team_pairs", force: true do |t|
+    t.integer  "user_id"
+    t.integer  "team_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "user_team_pairs", ["team_id"], name: "index_user_team_pairs_on_team_id"
+  add_index "user_team_pairs", ["user_id"], name: "index_user_team_pairs_on_user_id"
+
+  create_table "users", force: true do |t|
+    t.string   "name"
+    t.string   "email"
+    t.string   "user_name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+end