run generate

22 files changed, 5 insertions, 5 deletions

diff --git a/db/migrate/20140404212449_create_simple_captcha_data.rb b/db/migrate/20140405215315_create_simple_captcha_data.rb
index 4573b20..4573b20 100644
--- a/db/migrate/20140404212449_create_simple_captcha_data.rb
+++ b/db/migrate/20140405215315_create_simple_captcha_data.rb
diff --git a/db/migrate/20140405012452_create_servers.rb b/db/migrate/20140406015318_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140405012452_create_servers.rb
+++ b/db/migrate/20140406015318_create_servers.rb
diff --git a/db/migrate/20140405012455_create_matches.rb b/db/migrate/20140406015321_create_matches.rb
index 31eea12..31eea12 100644
--- a/db/migrate/20140405012455_create_matches.rb
+++ b/db/migrate/20140406015321_create_matches.rb
diff --git a/db/migrate/20140405012457_create_teams.rb b/db/migrate/20140406015324_create_teams.rb
index fdf9a68..fdf9a68 100644
--- a/db/migrate/20140405012457_create_teams.rb
+++ b/db/migrate/20140406015324_create_teams.rb
diff --git a/db/migrate/20140405012500_create_alerts.rb b/db/migrate/20140406015327_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140405012500_create_alerts.rb
+++ b/db/migrate/20140406015327_create_alerts.rb
diff --git a/db/migrate/20140405012503_create_pms.rb b/db/migrate/20140406015330_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140405012503_create_pms.rb
+++ b/db/migrate/20140406015330_create_pms.rb
diff --git a/db/migrate/20140405012506_create_tournaments.rb b/db/migrate/20140406015332_create_tournaments.rb
index c0d8929..c0d8929 100644
--- a/db/migrate/20140405012506_create_tournaments.rb
+++ b/db/migrate/20140406015332_create_tournaments.rb
diff --git a/db/migrate/20140405012508_create_games.rb b/db/migrate/20140406015335_create_games.rb
index 5e4f56f..5e4f56f 100644
--- a/db/migrate/20140405012508_create_games.rb
+++ b/db/migrate/20140406015335_create_games.rb
diff --git a/db/migrate/20140405012510_create_users.rb b/db/migrate/20140406015338_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140405012510_create_users.rb
+++ b/db/migrate/20140406015338_create_users.rb
diff --git a/db/migrate/20140405012513_create_sessions.rb b/db/migrate/20140406015341_create_sessions.rb
index f667f1e..f667f1e 100644
--- a/db/migrate/20140405012513_create_sessions.rb
+++ b/db/migrate/20140406015341_create_sessions.rb
diff --git a/db/migrate/20140405012516_create_server_settings.rb b/db/migrate/20140406015344_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140405012516_create_server_settings.rb
+++ b/db/migrate/20140406015344_create_server_settings.rb
diff --git a/db/migrate/20140405012519_create_game_settings.rb b/db/migrate/20140406015347_create_game_settings.rb
index eed6b00..b1caf5d 100644
--- a/db/migrate/20140405012519_create_game_settings.rb
+++ b/db/migrate/20140406015347_create_game_settings.rb
@@ -2,7 +2,7 @@ class CreateGameSettings < ActiveRecord::Migration
   def change
     create_table :game_settings do |t|
       t.references :game, index: true
-      t.integer :type
+      t.integer :stype
       t.string :name
       t.text :default
       t.text :description
diff --git a/db/migrate/20140405012521_create_tournament_preferences.rb b/db/migrate/20140406015350_create_tournament_preferences.rb
index 991d659..991d659 100644
--- a/db/migrate/20140405012521_create_tournament_preferences.rb
+++ b/db/migrate/20140406015350_create_tournament_preferences.rb
diff --git a/db/migrate/20140405012524_create_scores.rb b/db/migrate/20140406015353_create_scores.rb
index 4ca0b0b..4ca0b0b 100644
--- a/db/migrate/20140405012524_create_scores.rb
+++ b/db/migrate/20140406015353_create_scores.rb
diff --git a/db/migrate/20140405012527_create_remote_usernames.rb b/db/migrate/20140406015356_create_remote_usernames.rb
index e265985..e265985 100644
--- a/db/migrate/20140405012527_create_remote_usernames.rb
+++ b/db/migrate/20140406015356_create_remote_usernames.rb
diff --git a/db/migrate/20140405012529_create_tournament_players_join_table.rb b/db/migrate/20140406015359_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140405012529_create_tournament_players_join_table.rb
+++ b/db/migrate/20140406015359_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140405012532_create_tournament_hosts_join_table.rb b/db/migrate/20140406015401_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140405012532_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140406015401_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140405012535_create_team_user_join_table.rb b/db/migrate/20140406015404_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140405012535_create_team_user_join_table.rb
+++ b/db/migrate/20140406015404_create_team_user_join_table.rb
diff --git a/db/migrate/20140405012537_create_match_team_join_table.rb b/db/migrate/20140406015406_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140405012537_create_match_team_join_table.rb
+++ b/db/migrate/20140406015406_create_match_team_join_table.rb
diff --git a/db/migrate/20140405012548_add_hidden_attrs_to_user.rb b/db/migrate/20140406015417_add_hidden_attrs_to_user.rb
index 9b5c505..9b5c505 100644
--- a/db/migrate/20140405012548_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140406015417_add_hidden_attrs_to_user.rb
diff --git a/db/schema.rb b/db/schema.rb
index c0d4fee..829ad0e 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: 20140405012548) do
+ActiveRecord::Schema.define(version: 20140406015417) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -24,7 +24,7 @@ ActiveRecord::Schema.define(version: 20140405012548) do
 
   create_table "game_settings", force: true do |t|
     t.integer  "game_id"
-    t.integer  "type"
+    t.integer  "stype"
     t.string   "name"
     t.text     "default"
     t.text     "description"
diff --git a/test/fixtures/game_settings.yml b/test/fixtures/game_settings.yml
index 7497d02..2b574fd 100644
--- a/test/fixtures/game_settings.yml
+++ b/test/fixtures/game_settings.yml
@@ -2,7 +2,7 @@
 
 one:
   game_id: 
-  type: 1
+  stype: 1
   name: MyString
   default: MyText
   description: MyText
@@ -11,7 +11,7 @@ one:
 
 two:
   game_id: 
-  type: 1
+  stype: 1
   name: MyString
   default: MyText
   description: MyText