kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Bump Jbuilder version to 2.0.0

Browse source
This commit is contained in:
Pavel Pravosud 2013-12-20 10:35:32 -05:00
parent 15e442b523
commit e1aaa2ff73
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
guides/code/getting_started/Gemfile
View file

@ -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'

4
guides/code/getting_started/Gemfile.lock
View file

@ -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

2
railties/lib/rails/generators/app_base.rb
View file

@ -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