Merge pull request #10461 from rwz/master

Relaxed jbuilder dependency in Gemfile template
rails · May 4, 2013 · b2c98a5 · b2c98a5
1 parent 9baf8a0
commit b2c98a5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/guides/code/getting_started/Gemfile.lock b/guides/code/getting_started/Gemfile.lock
@@ -92,7 +92,7 @@ GEM
       multi_json (~> 1.0)
     hike (1.2.1)
     i18n (0.6.1)
-    jbuilder (1.0.2)
+    jbuilder (1.3.0)
       activesupport (>= 3.0.0)
     jquery-rails (2.2.0)
       railties (>= 3.0, < 5.0)

diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -10,7 +10,7 @@ source 'https://rubygems.org'
 <%= javascript_gemfile_entry -%>
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 1.0.1'
+gem 'jbuilder', '~> 1.2'
 
 group :doc do
   # bundle exec rake doc:rails generates the API under doc/api.