aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorPavel Pravosud <pavel@pravosud.com>2013-12-20 10:35:32 -0500
committerPavel Pravosud <pavel@pravosud.com>2013-12-20 10:35:32 -0500
commite1aaa2ff73f78db89721eee2517eeb689f84a5a1 (patch)
tree796c7d3de8868e76754546306a66baabda3596f8 /guides
parent15e442b5238929842de2aa7719eeb58ca9e86e0d (diff)
downloadrails-e1aaa2ff73f78db89721eee2517eeb689f84a5a1.tar.gz
rails-e1aaa2ff73f78db89721eee2517eeb689f84a5a1.tar.bz2
rails-e1aaa2ff73f78db89721eee2517eeb689f84a5a1.zip
Bump Jbuilder version to 2.0.0
Diffstat (limited to 'guides')
-rw-r--r--guides/code/getting_started/Gemfile2
-rw-r--r--guides/code/getting_started/Gemfile.lock4
2 files changed, 3 insertions, 3 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