Merge pull request #74 from jasnow/master

Rebuilt Gemfile.lock file (i18n, listen) then got rid of i18n warning.
This commit is contained in:
mccabe615
2013-12-08 10:06:45 -08:00
3 changed files with 6 additions and 5 deletions
-1
View File
@@ -10,7 +10,6 @@ gem 'rack', '1.4.0'
gem 'sqlite3'
gem 'foreman'
group :development do
gem 'brakeman'
gem 'bundler-audit'
+4 -4
View File
@@ -116,9 +116,9 @@ GEM
em-websocket (~> 0.5)
guard (~> 2.0)
multi_json (~> 1.8)
guard-rspec (4.1.0)
guard-rspec (4.2.0)
guard (>= 2.1.1)
rspec (~> 2.14)
rspec (>= 2.14, < 4.0)
guard-shell (0.5.2)
guard (>= 1.1.0)
haml (4.0.4)
@@ -127,7 +127,7 @@ GEM
highline (1.6.20)
hike (1.2.3)
http_parser.rb (0.5.3)
i18n (0.6.5)
i18n (0.6.9)
journey (1.0.4)
jquery-fileupload-rails (0.4.1)
actionpack (>= 3.1)
@@ -140,7 +140,7 @@ GEM
launchy (2.4.2)
addressable (~> 2.3)
libv8 (3.16.14.3)
listen (2.2.0)
listen (2.4.0)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
+2
View File
@@ -61,5 +61,7 @@ module Railsgoat
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
I18n.config.enforce_available_locales = false
end
end