Permalink
Browse files

Updated to Rails 4.0.2

  • Loading branch information...
1 parent dd1596b commit b331271537fecfdf80667d3bc9e5a15f3505e42f @mischa78 committed Dec 4, 2013
Showing with 26 additions and 25 deletions.
  1. +1 −1 Gemfile
  2. +24 −24 Gemfile.lock
  3. +1 −0 config/application.rb
View
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '4.0.1'
+gem 'rails', '4.0.2'
gem 'sqlite3'
gem 'sass-rails', '~> 4.0.0'
gem 'uglifier', '>= 1.3.0'
View
@@ -1,25 +1,25 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (4.0.1)
- actionpack (= 4.0.1)
+ actionmailer (4.0.2)
+ actionpack (= 4.0.2)
mail (~> 2.5.4)
- actionpack (4.0.1)
- activesupport (= 4.0.1)
+ actionpack (4.0.2)
+ activesupport (= 4.0.2)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
- activemodel (4.0.1)
- activesupport (= 4.0.1)
+ activemodel (4.0.2)
+ activesupport (= 4.0.2)
builder (~> 3.1.0)
- activerecord (4.0.1)
- activemodel (= 4.0.1)
+ activerecord (4.0.2)
+ activemodel (= 4.0.2)
activerecord-deprecated_finders (~> 1.0.2)
- activesupport (= 4.0.1)
+ activesupport (= 4.0.2)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
- activesupport (4.0.1)
+ activesupport (4.0.2)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
@@ -50,7 +50,7 @@ GEM
factory_girl (~> 4.3.0)
railties (>= 3.0.0)
hike (1.2.3)
- i18n (0.6.5)
+ i18n (0.6.9)
jquery-fileupload-rails (0.4.1)
actionpack (>= 3.1)
railties (>= 3.1)
@@ -61,7 +61,7 @@ GEM
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.25)
+ mime-types (1.25.1)
minitest (4.7.5)
multi_json (1.8.2)
paperclip (3.5.2)
@@ -73,17 +73,17 @@ GEM
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
- rails (4.0.1)
- actionmailer (= 4.0.1)
- actionpack (= 4.0.1)
- activerecord (= 4.0.1)
- activesupport (= 4.0.1)
+ rails (4.0.2)
+ actionmailer (= 4.0.2)
+ actionpack (= 4.0.2)
+ activerecord (= 4.0.2)
+ activesupport (= 4.0.2)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.0.1)
+ railties (= 4.0.2)
sprockets-rails (~> 2.0.0)
- railties (4.0.1)
- actionpack (= 4.0.1)
- activesupport (= 4.0.1)
+ railties (4.0.2)
+ actionpack (= 4.0.2)
+ activesupport (= 4.0.2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.1.0)
@@ -92,7 +92,7 @@ GEM
railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10)
sprockets-rails (~> 2.0.0)
- sprockets (2.10.0)
+ sprockets (2.10.1)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
@@ -110,7 +110,7 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.38)
- uglifier (2.3.1)
+ uglifier (2.3.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
@@ -125,7 +125,7 @@ DEPENDENCIES
jquery-fileupload-rails
jquery-rails
paperclip
- rails (= 4.0.1)
+ rails (= 4.0.2)
sass-rails (~> 4.0.0)
sqlite3
uglifier (>= 1.3.0)
View
@@ -19,5 +19,6 @@ class Application < Rails::Application
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
# config.i18n.default_locale = :de
+ config.i18n.enforce_available_locales = true
end
end

0 comments on commit b331271

Please sign in to comment.