aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-20 07:47:42 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-20 07:47:42 -0800
commitd0ffa7f8535dc343bb8a421520ea32d8e8be916f (patch)
tree796c7d3de8868e76754546306a66baabda3596f8 /railties
parent15e442b5238929842de2aa7719eeb58ca9e86e0d (diff)
parente1aaa2ff73f78db89721eee2517eeb689f84a5a1 (diff)
downloadrails-d0ffa7f8535dc343bb8a421520ea32d8e8be916f.tar.gz
rails-d0ffa7f8535dc343bb8a421520ea32d8e8be916f.tar.bz2
rails-d0ffa7f8535dc343bb8a421520ea32d8e8be916f.zip
Merge pull request #13422 from rwz/master
Bump Jbuilder version to 2.0.0
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/app_base.rb2
1 files changed, 1 insertions, 1 deletions
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