Permalink
Browse files

Merge pull request #10461 from rwz/master

Relaxed jbuilder dependency in Gemfile template
  • Loading branch information...
2 parents 8c4a9c0 + cf733bc commit cc50aab3babfac508b03e6f6a21a101ef9c12929 @rafaelfranca rafaelfranca committed May 4, 2013
View
2 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)
View
2 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.

0 comments on commit cc50aab

Please sign in to comment.