diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-20 07:47:42 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-20 07:47:42 -0800 |
| commit | d0ffa7f8535dc343bb8a421520ea32d8e8be916f (patch) | |
| tree | 796c7d3de8868e76754546306a66baabda3596f8 | |
| parent | 15e442b5238929842de2aa7719eeb58ca9e86e0d (diff) | |
| parent | e1aaa2ff73f78db89721eee2517eeb689f84a5a1 (diff) | |
| download | rails-d0ffa7f8535dc343bb8a421520ea32d8e8be916f.tar.gz rails-d0ffa7f8535dc343bb8a421520ea32d8e8be916f.tar.bz2 rails-d0ffa7f8535dc343bb8a421520ea32d8e8be916f.zip | |
Merge pull request #13422 from rwz/master
Bump Jbuilder version to 2.0.0
| -rw-r--r-- | guides/code/getting_started/Gemfile | 2 | ||||
| -rw-r--r-- | guides/code/getting_started/Gemfile.lock | 4 | ||||
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 |
3 files changed, 4 insertions, 4 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 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 |