Gemfile.lock

24 files changed, 8 insertions, 21 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index b47c41e..9dd0199 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -26,7 +26,7 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     arel (4.0.2)
-    atomic (1.1.14)
+    atomic (1.1.15)
     bcrypt-ruby (3.1.2)
     bootstrap-sass (3.1.1.0)
       sass (~> 3.2)
@@ -115,7 +115,7 @@ GEM
       multi_json (~> 1.0)
       rubyzip (< 1.0.0)
       websocket (~> 1.0.4)
-    sprockets (2.10.1)
+    sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -124,13 +124,13 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.8)
+    sqlite3 (1.3.9)
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
+    thread_safe (0.2.0)
+      atomic (>= 1.1.7, < 2)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
diff --git a/config/application.rb b/config/application.rb
index bf581b8..57c9163 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -12,6 +12,8 @@ module Leaguer
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
+	I18n.enforce_available_locales = true
+
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
diff --git a/db/migrate/20140304015610_create_servers.rb b/db/migrate/20140304015655_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140304015610_create_servers.rb
+++ b/db/migrate/20140304015655_create_servers.rb
diff --git a/db/migrate/20140304015612_create_tournaments.rb b/db/migrate/20140304015657_create_tournaments.rb
index 36fcf7e..36fcf7e 100644
--- a/db/migrate/20140304015612_create_tournaments.rb
+++ b/db/migrate/20140304015657_create_tournaments.rb
diff --git a/db/migrate/20140304015615_create_matches.rb b/db/migrate/20140304015700_create_matches.rb
index 6c0c157..6c0c157 100644
--- a/db/migrate/20140304015615_create_matches.rb
+++ b/db/migrate/20140304015700_create_matches.rb
diff --git a/db/migrate/20140304015617_create_teams.rb b/db/migrate/20140304015702_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140304015617_create_teams.rb
+++ b/db/migrate/20140304015702_create_teams.rb
diff --git a/db/migrate/20140304015622_create_users.rb b/db/migrate/20140304015706_create_users.rb
index f0986d4..f0986d4 100644
--- a/db/migrate/20140304015622_create_users.rb
+++ b/db/migrate/20140304015706_create_users.rb
diff --git a/db/migrate/20140304015624_create_user_team_pairs.rb b/db/migrate/20140304015709_create_user_team_pairs.rb
index 2c492ac..2c492ac 100644
--- a/db/migrate/20140304015624_create_user_team_pairs.rb
+++ b/db/migrate/20140304015709_create_user_team_pairs.rb
diff --git a/db/migrate/20140304015626_create_team_match_pairs.rb b/db/migrate/20140304015711_create_team_match_pairs.rb
index 8fac07e..8fac07e 100644
--- a/db/migrate/20140304015626_create_team_match_pairs.rb
+++ b/db/migrate/20140304015711_create_team_match_pairs.rb
diff --git a/db/migrate/20140304015628_create_alerts.rb b/db/migrate/20140304015713_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140304015628_create_alerts.rb
+++ b/db/migrate/20140304015713_create_alerts.rb
diff --git a/db/migrate/20140304015631_create_pms.rb b/db/migrate/20140304015715_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140304015631_create_pms.rb
+++ b/db/migrate/20140304015715_create_pms.rb
diff --git a/db/migrate/20140304015633_create_games.rb b/db/migrate/20140304015718_create_games.rb
index 59d4ef0..59d4ef0 100644
--- a/db/migrate/20140304015633_create_games.rb
+++ b/db/migrate/20140304015718_create_games.rb
diff --git a/db/migrate/20140304015635_create_game_attributes.rb b/db/migrate/20140304015720_create_game_attributes.rb
index b63f134..b63f134 100644
--- a/db/migrate/20140304015635_create_game_attributes.rb
+++ b/db/migrate/20140304015720_create_game_attributes.rb
diff --git a/db/migrate/20140304015638_create_server_settings.rb b/db/migrate/20140304015722_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140304015638_create_server_settings.rb
+++ b/db/migrate/20140304015722_create_server_settings.rb
diff --git a/db/migrate/20140304015644_create_tournament_options.rb b/db/migrate/20140304015729_create_tournament_options.rb
index d2df22e..d2df22e 100644
--- a/db/migrate/20140304015644_create_tournament_options.rb
+++ b/db/migrate/20140304015729_create_tournament_options.rb
diff --git a/db/schema.rb b/db/schema.rb
index d44352e..4a44343 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: 20140304015644) do
+ActiveRecord::Schema.define(version: 20140304015729) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
diff --git a/log/.keep b/log/.keep
deleted file mode 100644
index e69de29..0000000
--- a/log/.keep
+++ /dev/null
diff --git a/test/controllers/.keep b/test/controllers/.keep
deleted file mode 100644
index e69de29..0000000
--- a/test/controllers/.keep
+++ /dev/null
diff --git a/test/fixtures/.keep b/test/fixtures/.keep
deleted file mode 100644
index e69de29..0000000
--- a/test/fixtures/.keep
+++ /dev/null
diff --git a/test/helpers/.keep b/test/helpers/.keep
deleted file mode 100644
index e69de29..0000000
--- a/test/helpers/.keep
+++ /dev/null
diff --git a/test/integration/.keep b/test/integration/.keep
deleted file mode 100644
index e69de29..0000000
--- a/test/integration/.keep
+++ /dev/null
diff --git a/test/mailers/.keep b/test/mailers/.keep
deleted file mode 100644
index e69de29..0000000
--- a/test/mailers/.keep
+++ /dev/null
diff --git a/test/models/.keep b/test/models/.keep
deleted file mode 100644
index e69de29..0000000
--- a/test/models/.keep
+++ /dev/null
diff --git a/test/test_helper.rb b/test/test_helper.rb
deleted file mode 100644
index bc7e05d..0000000
--- a/test/test_helper.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-ENV["RAILS_ENV"] ||= "test"
-require File.expand_path('../../config/environment', __FILE__)
-require 'rails/test_help'
-
-class ActiveSupport::TestCase
-  ActiveRecord::Migration.check_pending!
-
-  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
-  #
-  # Note: You'll currently still have to declare fixtures explicitly in integration tests
-  # -- they do not yet inherit this setting
-  fixtures :all
-
-  # Add more helper methods to be used by all tests here...
-end