mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #10461 from rwz/master
Relaxed jbuilder dependency in Gemfile template
This commit is contained in:
commit
cc50aab3ba
2 changed files with 2 additions and 2 deletions
|
@ -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)
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue