diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-04 20:44:43 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-04 20:44:43 -0400 |
| commit | 38d6960be1efdb6345445ab293a8cd605193785f (patch) | |
| tree | df37e79b5744b570aded5aa4d7fe38cd772a49fe /db | |
| parent | bcfa571b0328a4b3e94479a31c027621ceb86ad5 (diff) | |
| parent | d14dcf9af11a0f2eab2609efb7d9e59a9cc18bb0 (diff) | |
Merge branch 'master' into luke
Conflicts:
app/controllers/application_controller.rb
app/controllers/tournaments_controller.rb
Diffstat (limited to 'db')
| -rw-r--r-- | db/schema.rb | 11 | ||||
| -rw-r--r-- | db/seeds.rb | 9 |
2 files changed, 18 insertions, 2 deletions
diff --git a/db/schema.rb b/db/schema.rb index 113f16d..30ac1af 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: 20140403155049) do +ActiveRecord::Schema.define(version: 20140403171427) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -129,6 +129,15 @@ ActiveRecord::Schema.define(version: 20140403155049) do add_index "sessions", ["token"], name: "index_sessions_on_token", unique: true add_index "sessions", ["user_id"], name: "index_sessions_on_user_id" + create_table "simple_captcha_data", force: true do |t| + t.string "key", limit: 40 + t.string "value", limit: 6 + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "simple_captcha_data", ["key"], name: "idx_key" + create_table "teams", force: true do |t| t.integer "match_id" t.datetime "created_at" diff --git a/db/seeds.rb b/db/seeds.rb index 06b46a6..22f1595 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -6,7 +6,14 @@ # cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) # Mayor.create(name: 'Emanuel', city: cities.first) # -Game.create(name: "League of Legends",min_players_per_team: 1, max_players_per_team: 1, min_teams_per_match: 2, max_teams_per_match: 2, set_rounds: nil, randomized_teams: true) +Game.create(name: "League of Legends",min_players_per_team: 5, max_players_per_team: 5, min_teams_per_match: 2, max_teams_per_match: 2, set_rounds: nil, randomized_teams: true) Game.create(name: "Chess", min_players_per_team: 1, max_players_per_team: 1, min_teams_per_match: 2, max_teams_per_match: 2, set_rounds: nil, randomized_teams: true) +Game.create(name: "Hearthstone", min_players_per_team: 1, max_players_per_team: 1, min_teams_per_match: 2, max_teams_per_match: 2, set_rounds: 1, randomized_teams: false) + + +GameSetting.create(game_id: 0, name: "Map", default: "Summoners Rift,Twisted Treeline,Crystal Scar,Haunted Abyss", discription: "Select a map to play on.", type_opt: "Select", display_order: 1) +GameSetting.create(game_id: 0, name: "Pick Type", default: "Blind Pick,Draft", discription: "Select a pick type.", type_opt: "Select", display_order: 2) + +#Game_setting.create(game_id: , type: , name: , default: , discription: , type_opt: , display_order: , created_at: , updated_at: ) #User.create(id: 1, name: "Andrew", email: "amurrel@example.com", user_name: "ImFromNASA", created_at: "2014-03-07 22:48:53", updated_at: "2014-03-07 22:48:53", password_digest: "$2a$10$W0FwPRDzdQp8arolCHGt5ezXqkOiTLNsXI5GKGtu9qr3...", remember_token: "1583722b02663e024533296171cad79f29037ebc", groups: 0) |