aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--guides/code/getting_started/Gemfile2
-rw-r--r--guides/code/getting_started/Gemfile.lock4
-rw-r--r--railties/lib/rails/generators/app_base.rb2
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/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index bbf7530091..3305a57b62 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -329,7 +329,7 @@ module Rails
def jbuilder_gemfile_entry
comment = 'Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder'
- GemfileEntry.version('jbuilder', '~> 1.2', comment)
+ GemfileEntry.version('jbuilder', '~> 2.0', comment)
end
def sdoc_gemfile_entry