aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-03-24 22:24:46 -0700
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-03-24 22:24:46 -0700
commit592b4b40c285419e3074da99f82e0da40f29e6d0 (patch)
treebff67065c8e0368dc14064fee7ca3377119cb906 /guides
parent558f3204463eea80dc32b6748fe8b4174ec7ff14 (diff)
parent2b660f1dcb5f94fcec3d2f52735a7eaddf5051a3 (diff)
downloadrails-592b4b40c285419e3074da99f82e0da40f29e6d0.tar.gz
rails-592b4b40c285419e3074da99f82e0da40f29e6d0.tar.bz2
rails-592b4b40c285419e3074da99f82e0da40f29e6d0.zip
Merge pull request #9912 from rwz/jbuilder-bump
Relaxed jbuilder dependency and bumped version number
Diffstat (limited to 'guides')
-rw-r--r--guides/code/getting_started/Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/code/getting_started/Gemfile b/guides/code/getting_started/Gemfile
index b355c7d91a..dca00b43cd 100644
--- a/guides/code/getting_started/Gemfile
+++ b/guides/code/getting_started/Gemfile
@@ -23,7 +23,7 @@ gem 'jquery-rails'
gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 1.0.1'
+gem 'jbuilder', '~> 1.2'
# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'