diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-04 05:25:30 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-04 05:25:30 -0700 |
| commit | cc50aab3babfac508b03e6f6a21a101ef9c12929 (patch) | |
| tree | a533b3fff23d6d96d2dffa8ab312893c7e46fca8 /railties | |
| parent | 8c4a9c0ad8afa9d700d9a1bb89da2b2a9dc89423 (diff) | |
| parent | cf733bce5e14f42f0bf4c91b00fa0de9aadc1cfb (diff) | |
| download | rails-cc50aab3babfac508b03e6f6a21a101ef9c12929.tar.gz rails-cc50aab3babfac508b03e6f6a21a101ef9c12929.tar.bz2 rails-cc50aab3babfac508b03e6f6a21a101ef9c12929.zip | |
Merge pull request #10461 from rwz/master
Relaxed jbuilder dependency in Gemfile template
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index ace804ffe6..243e7e9da8 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/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. |