Commit 84831c875bea8001a3e7fe53bd9466e8f382340e
Committed by
Paulo Meireles
Paulo Meireles
1 parent
b6f2daf0
Exists in
colab
and in
4 other branches
Updated to Rails 4.0.2
Showing
3 changed files
with
23 additions
and
22 deletions
Show diff stats
Gemfile
| 1 | source 'https://rubygems.org' | 1 | source 'https://rubygems.org' |
| 2 | 2 | ||
| 3 | # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' | 3 | # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' |
| 4 | -gem 'rails', '4.0.1' | 4 | +gem 'rails', '4.0.2' |
| 5 | 5 | ||
| 6 | # Use sqlite3 as the database for Active Record | 6 | # Use sqlite3 as the database for Active Record |
| 7 | gem 'sqlite3' | 7 | gem 'sqlite3' |
Gemfile.lock
| 1 | GEM | 1 | GEM |
| 2 | remote: https://rubygems.org/ | 2 | remote: https://rubygems.org/ |
| 3 | specs: | 3 | specs: |
| 4 | - actionmailer (4.0.1) | ||
| 5 | - actionpack (= 4.0.1) | 4 | + actionmailer (4.0.2) |
| 5 | + actionpack (= 4.0.2) | ||
| 6 | mail (~> 2.5.4) | 6 | mail (~> 2.5.4) |
| 7 | - actionpack (4.0.1) | ||
| 8 | - activesupport (= 4.0.1) | 7 | + actionpack (4.0.2) |
| 8 | + activesupport (= 4.0.2) | ||
| 9 | builder (~> 3.1.0) | 9 | builder (~> 3.1.0) |
| 10 | erubis (~> 2.7.0) | 10 | erubis (~> 2.7.0) |
| 11 | rack (~> 1.5.2) | 11 | rack (~> 1.5.2) |
| 12 | rack-test (~> 0.6.2) | 12 | rack-test (~> 0.6.2) |
| 13 | - activemodel (4.0.1) | ||
| 14 | - activesupport (= 4.0.1) | 13 | + activemodel (4.0.2) |
| 14 | + activesupport (= 4.0.2) | ||
| 15 | builder (~> 3.1.0) | 15 | builder (~> 3.1.0) |
| 16 | - activerecord (4.0.1) | ||
| 17 | - activemodel (= 4.0.1) | 16 | + activerecord (4.0.2) |
| 17 | + activemodel (= 4.0.2) | ||
| 18 | activerecord-deprecated_finders (~> 1.0.2) | 18 | activerecord-deprecated_finders (~> 1.0.2) |
| 19 | - activesupport (= 4.0.1) | 19 | + activesupport (= 4.0.2) |
| 20 | arel (~> 4.0.0) | 20 | arel (~> 4.0.0) |
| 21 | activerecord-deprecated_finders (1.0.3) | 21 | activerecord-deprecated_finders (1.0.3) |
| 22 | - activesupport (4.0.1) | 22 | + activesupport (4.0.2) |
| 23 | i18n (~> 0.6, >= 0.6.4) | 23 | i18n (~> 0.6, >= 0.6.4) |
| 24 | minitest (~> 4.2) | 24 | minitest (~> 4.2) |
| 25 | multi_json (~> 1.3) | 25 | multi_json (~> 1.3) |
| @@ -103,7 +103,7 @@ GEM | @@ -103,7 +103,7 @@ GEM | ||
| 103 | httpi (2.1.0) | 103 | httpi (2.1.0) |
| 104 | rack | 104 | rack |
| 105 | rubyntlm (~> 0.3.2) | 105 | rubyntlm (~> 0.3.2) |
| 106 | - i18n (0.6.5) | 106 | + i18n (0.6.9) |
| 107 | jbuilder (1.5.2) | 107 | jbuilder (1.5.2) |
| 108 | activesupport (>= 3.0.0) | 108 | activesupport (>= 3.0.0) |
| 109 | multi_json (>= 1.2.0) | 109 | multi_json (>= 1.2.0) |
| @@ -152,17 +152,17 @@ GEM | @@ -152,17 +152,17 @@ GEM | ||
| 152 | rack (1.5.2) | 152 | rack (1.5.2) |
| 153 | rack-test (0.6.2) | 153 | rack-test (0.6.2) |
| 154 | rack (>= 1.0) | 154 | rack (>= 1.0) |
| 155 | - rails (4.0.1) | ||
| 156 | - actionmailer (= 4.0.1) | ||
| 157 | - actionpack (= 4.0.1) | ||
| 158 | - activerecord (= 4.0.1) | ||
| 159 | - activesupport (= 4.0.1) | 155 | + rails (4.0.2) |
| 156 | + actionmailer (= 4.0.2) | ||
| 157 | + actionpack (= 4.0.2) | ||
| 158 | + activerecord (= 4.0.2) | ||
| 159 | + activesupport (= 4.0.2) | ||
| 160 | bundler (>= 1.3.0, < 2.0) | 160 | bundler (>= 1.3.0, < 2.0) |
| 161 | - railties (= 4.0.1) | 161 | + railties (= 4.0.2) |
| 162 | sprockets-rails (~> 2.0.0) | 162 | sprockets-rails (~> 2.0.0) |
| 163 | - railties (4.0.1) | ||
| 164 | - actionpack (= 4.0.1) | ||
| 165 | - activesupport (= 4.0.1) | 163 | + railties (4.0.2) |
| 164 | + actionpack (= 4.0.2) | ||
| 165 | + activesupport (= 4.0.2) | ||
| 166 | rake (>= 0.8.7) | 166 | rake (>= 0.8.7) |
| 167 | thor (>= 0.18.1, < 2.0) | 167 | thor (>= 0.18.1, < 2.0) |
| 168 | rake (10.1.0) | 168 | rake (10.1.0) |
| @@ -279,7 +279,7 @@ DEPENDENCIES | @@ -279,7 +279,7 @@ DEPENDENCIES | ||
| 279 | modernizr-rails | 279 | modernizr-rails |
| 280 | pg (~> 0.17.0) | 280 | pg (~> 0.17.0) |
| 281 | poltergeist (~> 1.4.0) | 281 | poltergeist (~> 1.4.0) |
| 282 | - rails (= 4.0.1) | 282 | + rails (= 4.0.2) |
| 283 | rspec-rails | 283 | rspec-rails |
| 284 | sass-rails (~> 4.0.0.rc2) | 284 | sass-rails (~> 4.0.0.rc2) |
| 285 | sdoc | 285 | sdoc |
config/application.rb
| @@ -19,5 +19,6 @@ module Mezuro | @@ -19,5 +19,6 @@ module Mezuro | ||
| 19 | # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. | 19 | # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. |
| 20 | # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] | 20 | # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] |
| 21 | # config.i18n.default_locale = :de | 21 | # config.i18n.default_locale = :de |
| 22 | + config.i18n.enforce_available_locales = true | ||
| 22 | end | 23 | end |
| 23 | end | 24 | end |