Merge branch 'clean2'

Conflicts:
	app/views/servers/show.html.erb

20 files changed, 1 insertions, 0 deletions

diff --git a/db/migrate/20140405215315_create_simple_captcha_data.rb b/db/migrate/20140406131442_create_simple_captcha_data.rb
index 4573b20..4573b20 100644
--- a/db/migrate/20140405215315_create_simple_captcha_data.rb
+++ b/db/migrate/20140406131442_create_simple_captcha_data.rb
diff --git a/db/migrate/20140406015318_create_servers.rb b/db/migrate/20140406171445_create_servers.rb
index f33241a..fbe1b02 100644
--- a/db/migrate/20140406015318_create_servers.rb
+++ b/db/migrate/20140406171445_create_servers.rb
@@ -1,6 +1,7 @@
 class CreateServers < ActiveRecord::Migration
   def change
     create_table :servers do |t|
+      t.integer :default_user_permissions
 
       t.timestamps
     end
diff --git a/db/migrate/20140406015321_create_matches.rb b/db/migrate/20140406171448_create_matches.rb
index 31eea12..31eea12 100644
--- a/db/migrate/20140406015321_create_matches.rb
+++ b/db/migrate/20140406171448_create_matches.rb
diff --git a/db/migrate/20140406015324_create_teams.rb b/db/migrate/20140406171451_create_teams.rb
index fdf9a68..fdf9a68 100644
--- a/db/migrate/20140406015324_create_teams.rb
+++ b/db/migrate/20140406171451_create_teams.rb
diff --git a/db/migrate/20140406015327_create_alerts.rb b/db/migrate/20140406171453_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140406015327_create_alerts.rb
+++ b/db/migrate/20140406171453_create_alerts.rb
diff --git a/db/migrate/20140406015330_create_pms.rb b/db/migrate/20140406171456_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140406015330_create_pms.rb
+++ b/db/migrate/20140406171456_create_pms.rb
diff --git a/db/migrate/20140406015332_create_tournaments.rb b/db/migrate/20140406171459_create_tournaments.rb
index c0d8929..c0d8929 100644
--- a/db/migrate/20140406015332_create_tournaments.rb
+++ b/db/migrate/20140406171459_create_tournaments.rb
diff --git a/db/migrate/20140406015335_create_games.rb b/db/migrate/20140406171502_create_games.rb
index 5e4f56f..5e4f56f 100644
--- a/db/migrate/20140406015335_create_games.rb
+++ b/db/migrate/20140406171502_create_games.rb
diff --git a/db/migrate/20140406015338_create_users.rb b/db/migrate/20140406171505_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140406015338_create_users.rb
+++ b/db/migrate/20140406171505_create_users.rb
diff --git a/db/migrate/20140406015341_create_sessions.rb b/db/migrate/20140406171508_create_sessions.rb
index f667f1e..f667f1e 100644
--- a/db/migrate/20140406015341_create_sessions.rb
+++ b/db/migrate/20140406171508_create_sessions.rb
diff --git a/db/migrate/20140406015344_create_server_settings.rb b/db/migrate/20140406171510_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140406015344_create_server_settings.rb
+++ b/db/migrate/20140406171510_create_server_settings.rb
diff --git a/db/migrate/20140406015347_create_game_settings.rb b/db/migrate/20140406171513_create_game_settings.rb
index b1caf5d..b1caf5d 100644
--- a/db/migrate/20140406015347_create_game_settings.rb
+++ b/db/migrate/20140406171513_create_game_settings.rb
diff --git a/db/migrate/20140406015350_create_tournament_preferences.rb b/db/migrate/20140406171516_create_tournament_preferences.rb
index 991d659..991d659 100644
--- a/db/migrate/20140406015350_create_tournament_preferences.rb
+++ b/db/migrate/20140406171516_create_tournament_preferences.rb
diff --git a/db/migrate/20140406015353_create_scores.rb b/db/migrate/20140406171519_create_scores.rb
index 4ca0b0b..4ca0b0b 100644
--- a/db/migrate/20140406015353_create_scores.rb
+++ b/db/migrate/20140406171519_create_scores.rb
diff --git a/db/migrate/20140406015356_create_remote_usernames.rb b/db/migrate/20140406171522_create_remote_usernames.rb
index e265985..e265985 100644
--- a/db/migrate/20140406015356_create_remote_usernames.rb
+++ b/db/migrate/20140406171522_create_remote_usernames.rb
diff --git a/db/migrate/20140406015359_create_tournament_players_join_table.rb b/db/migrate/20140406171525_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140406015359_create_tournament_players_join_table.rb
+++ b/db/migrate/20140406171525_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140406015401_create_tournament_hosts_join_table.rb b/db/migrate/20140406171527_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140406015401_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140406171527_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140406015404_create_team_user_join_table.rb b/db/migrate/20140406171530_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140406015404_create_team_user_join_table.rb
+++ b/db/migrate/20140406171530_create_team_user_join_table.rb
diff --git a/db/migrate/20140406015406_create_match_team_join_table.rb b/db/migrate/20140406171532_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140406015406_create_match_team_join_table.rb
+++ b/db/migrate/20140406171532_create_match_team_join_table.rb
diff --git a/db/migrate/20140406015417_add_hidden_attrs_to_user.rb b/db/migrate/20140406171543_add_hidden_attrs_to_user.rb
index 9b5c505..9b5c505 100644
--- a/db/migrate/20140406015417_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140406171543_add_hidden_attrs_to_user.rb