Download as
Browse Code »

Commit 84831c875bea8001a3e7fe53bd9466e8f382340e

Authored by Rafael Manzo
Committed by Paulo Meireles
1 parent b6f2daf0
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Updated to Rails 4.0.2

Showing 3 changed files with 23 additions and 22 deletions   Show diff stats
Gemfile
  Diff comments   View file @84831c8
1 1 source 'https://rubygems.org'
2 2  
3 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 6 # Use sqlite3 as the database for Active Record
7 7 gem 'sqlite3'
... ...
Gemfile.lock
  Diff comments   View file @84831c8
1 1 GEM
2 2 remote: https://rubygems.org/
3 3 specs:
4   - actionmailer (4.0.1)
5   - actionpack (= 4.0.1)
  4 + actionmailer (4.0.2)
  5 + actionpack (= 4.0.2)
6 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 9 builder (~> 3.1.0)
10 10 erubis (~> 2.7.0)
11 11 rack (~> 1.5.2)
12 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 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 18 activerecord-deprecated_finders (~> 1.0.2)
19   - activesupport (= 4.0.1)
  19 + activesupport (= 4.0.2)
20 20 arel (~> 4.0.0)
21 21 activerecord-deprecated_finders (1.0.3)
22   - activesupport (4.0.1)
  22 + activesupport (4.0.2)
23 23 i18n (~> 0.6, >= 0.6.4)
24 24 minitest (~> 4.2)
25 25 multi_json (~> 1.3)
... ... @@ -103,7 +103,7 @@ GEM
103 103 httpi (2.1.0)
104 104 rack
105 105 rubyntlm (~> 0.3.2)
106   - i18n (0.6.5)
  106 + i18n (0.6.9)
107 107 jbuilder (1.5.2)
108 108 activesupport (>= 3.0.0)
109 109 multi_json (>= 1.2.0)
... ... @@ -152,17 +152,17 @@ GEM
152 152 rack (1.5.2)
153 153 rack-test (0.6.2)
154 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 160 bundler (>= 1.3.0, < 2.0)
161   - railties (= 4.0.1)
  161 + railties (= 4.0.2)
162 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 166 rake (>= 0.8.7)
167 167 thor (>= 0.18.1, < 2.0)
168 168 rake (10.1.0)
... ... @@ -279,7 +279,7 @@ DEPENDENCIES
279 279 modernizr-rails
280 280 pg (~> 0.17.0)
281 281 poltergeist (~> 1.4.0)
282   - rails (= 4.0.1)
  282 + rails (= 4.0.2)
283 283 rspec-rails
284 284 sass-rails (~> 4.0.0.rc2)
285 285 sdoc
... ...
config/application.rb
  Diff comments   View file @84831c8
... ... @@ -19,5 +19,6 @@ module Mezuro
19 19 # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
20 20 # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
21 21 # config.i18n.default_locale = :de
  22 + config.i18n.enforce_available_locales = true
22 23 end
23 24 end
... ...