now ran generate without ger

19 files changed, 6 insertions, 1 deletions

diff --git a/db/migrate/20140401215718_create_servers.rb b/db/migrate/20140402152830_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140401215718_create_servers.rb
+++ b/db/migrate/20140402152830_create_servers.rb
diff --git a/db/migrate/20140401215720_create_matches.rb b/db/migrate/20140402152832_create_matches.rb
index 31eea12..31eea12 100644
--- a/db/migrate/20140401215720_create_matches.rb
+++ b/db/migrate/20140402152832_create_matches.rb
diff --git a/db/migrate/20140401215723_create_teams.rb b/db/migrate/20140402152835_create_teams.rb
index fdf9a68..fdf9a68 100644
--- a/db/migrate/20140401215723_create_teams.rb
+++ b/db/migrate/20140402152835_create_teams.rb
diff --git a/db/migrate/20140401215725_create_alerts.rb b/db/migrate/20140402152837_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140401215725_create_alerts.rb
+++ b/db/migrate/20140402152837_create_alerts.rb
diff --git a/db/migrate/20140401215728_create_pms.rb b/db/migrate/20140402152840_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140401215728_create_pms.rb
+++ b/db/migrate/20140402152840_create_pms.rb
diff --git a/db/migrate/20140401215730_create_tournaments.rb b/db/migrate/20140402152842_create_tournaments.rb
index 55f76a3..c0d8929 100644
--- a/db/migrate/20140401215730_create_tournaments.rb
+++ b/db/migrate/20140402152842_create_tournaments.rb
@@ -4,6 +4,11 @@ class CreateTournaments < ActiveRecord::Migration
       t.string :name
       t.references :game, index: true
       t.integer :status
+      t.integer :min_players_per_team
+      t.integer :max_players_per_team
+      t.integer :min_teams_per_match
+      t.integer :max_teams_per_match
+      t.integer :set_rounds
       t.boolean :randomized_teams
 
       t.timestamps
diff --git a/db/migrate/20140401215733_create_games.rb b/db/migrate/20140402152845_create_games.rb
index 5e4f56f..5e4f56f 100644
--- a/db/migrate/20140401215733_create_games.rb
+++ b/db/migrate/20140402152845_create_games.rb
diff --git a/db/migrate/20140401215735_create_users.rb b/db/migrate/20140402152847_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140401215735_create_users.rb
+++ b/db/migrate/20140402152847_create_users.rb
diff --git a/db/migrate/20140401215738_create_sessions.rb b/db/migrate/20140402152850_create_sessions.rb
index fe25bf2..fe25bf2 100644
--- a/db/migrate/20140401215738_create_sessions.rb
+++ b/db/migrate/20140402152850_create_sessions.rb
diff --git a/db/migrate/20140401215750_create_remote_usernames.rb b/db/migrate/20140402152852_create_remote_usernames.rb
index e265985..b837e53 100644
--- a/db/migrate/20140401215750_create_remote_usernames.rb
+++ b/db/migrate/20140402152852_create_remote_usernames.rb
@@ -3,7 +3,7 @@ class CreateRemoteUsernames < ActiveRecord::Migration
     create_table :remote_usernames do |t|
       t.references :game, index: true
       t.references :user, index: true
-      t.text :json_value
+      t.string :user_name
 
       t.timestamps
     end
diff --git a/db/migrate/20140401215740_create_server_settings.rb b/db/migrate/20140402152855_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140401215740_create_server_settings.rb
+++ b/db/migrate/20140402152855_create_server_settings.rb
diff --git a/db/migrate/20140401215743_create_game_settings.rb b/db/migrate/20140402152857_create_game_settings.rb
index 0ebbf18..0ebbf18 100644
--- a/db/migrate/20140401215743_create_game_settings.rb
+++ b/db/migrate/20140402152857_create_game_settings.rb
diff --git a/db/migrate/20140401215745_create_tournament_preferences.rb b/db/migrate/20140402152900_create_tournament_preferences.rb
index 991d659..991d659 100644
--- a/db/migrate/20140401215745_create_tournament_preferences.rb
+++ b/db/migrate/20140402152900_create_tournament_preferences.rb
diff --git a/db/migrate/20140401215747_create_scores.rb b/db/migrate/20140402152902_create_scores.rb
index 4ca0b0b..4ca0b0b 100644
--- a/db/migrate/20140401215747_create_scores.rb
+++ b/db/migrate/20140402152902_create_scores.rb
diff --git a/db/migrate/20140401215752_create_tournament_players_join_table.rb b/db/migrate/20140402152907_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140401215752_create_tournament_players_join_table.rb
+++ b/db/migrate/20140402152907_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140401215755_create_tournament_hosts_join_table.rb b/db/migrate/20140402152909_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140401215755_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140402152909_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140401215757_create_team_user_join_table.rb b/db/migrate/20140402152912_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140401215757_create_team_user_join_table.rb
+++ b/db/migrate/20140402152912_create_team_user_join_table.rb
diff --git a/db/migrate/20140401215800_create_match_team_join_table.rb b/db/migrate/20140402152914_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140401215800_create_match_team_join_table.rb
+++ b/db/migrate/20140402152914_create_match_team_join_table.rb
diff --git a/db/migrate/20140401215809_add_hidden_attrs_to_user.rb b/db/migrate/20140402152924_add_hidden_attrs_to_user.rb
index 2f1b0b2..2f1b0b2 100644
--- a/db/migrate/20140401215809_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140402152924_add_hidden_attrs_to_user.rb