diff options
Diffstat (limited to 'guides/code/getting_started')
| -rw-r--r-- | guides/code/getting_started/Gemfile | 2 | ||||
| -rw-r--r-- | guides/code/getting_started/Gemfile.lock | 4 | ||||
| -rw-r--r-- | guides/code/getting_started/config/environments/production.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/guides/code/getting_started/Gemfile b/guides/code/getting_started/Gemfile index eef6180804..d573488bdb 100644 --- a/guides/code/getting_started/Gemfile +++ b/guides/code/getting_started/Gemfile @@ -28,7 +28,7 @@ group :doc do end # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 1.2' +gem 'jbuilder', '~> 2.0' # To use ActiveModel has_secure_password # gem 'bcrypt-ruby', '~> 3.1.2' diff --git a/guides/code/getting_started/Gemfile.lock b/guides/code/getting_started/Gemfile.lock index 2d5c50ef5c..1c30ac5d75 100644 --- a/guides/code/getting_started/Gemfile.lock +++ b/guides/code/getting_started/Gemfile.lock @@ -40,7 +40,7 @@ GEM multi_json (~> 1.0) hike (1.2.3) i18n (0.6.4) - jbuilder (1.4.2) + jbuilder (2.0.0) activesupport (>= 3.0.0) multi_json (>= 1.2.0) jquery-rails (3.0.2) @@ -110,7 +110,7 @@ PLATFORMS DEPENDENCIES coffee-rails - jbuilder (~> 1.2) + jbuilder (~> 2.0) jquery-rails rails (= 4.0.0) sass-rails diff --git a/guides/code/getting_started/config/environments/production.rb b/guides/code/getting_started/config/environments/production.rb index 368a735122..93d44723fb 100644 --- a/guides/code/getting_started/config/environments/production.rb +++ b/guides/code/getting_started/config/environments/production.rb @@ -66,7 +66,7 @@ Blog::Application.configure do # config.action_mailer.raise_delivery_errors = false # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation can not be found). + # the I18n.default_locale when a translation cannot be found). config.i18n.fallbacks = true # Send deprecation notices to registered listeners. |