diff options
| author | Pavel Pravosud <pavel@pravosud.com> | 2013-05-04 13:46:01 +0700 |
|---|---|---|
| committer | Pavel Pravosud <pavel@pravosud.com> | 2013-05-04 13:46:01 +0700 |
| commit | cf733bce5e14f42f0bf4c91b00fa0de9aadc1cfb (patch) | |
| tree | 7272175f3c5b25aa45d08a003328cc22514d8061 | |
| parent | 66ac0c567dfcc6a31568d270dba335eb1971abc3 (diff) | |
| download | rails-cf733bce5e14f42f0bf4c91b00fa0de9aadc1cfb.tar.gz rails-cf733bce5e14f42f0bf4c91b00fa0de9aadc1cfb.tar.bz2 rails-cf733bce5e14f42f0bf4c91b00fa0de9aadc1cfb.zip | |
Relaxed jbuilder dependency in Gemfile template
| -rw-r--r-- | guides/code/getting_started/Gemfile | 2 | ||||
| -rw-r--r-- | guides/code/getting_started/Gemfile.lock | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/guides/code/getting_started/Gemfile b/guides/code/getting_started/Gemfile index b355c7d91a..dca00b43cd 100644 --- a/guides/code/getting_started/Gemfile +++ b/guides/code/getting_started/Gemfile @@ -23,7 +23,7 @@ gem 'jquery-rails' gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 1.0.1' +gem 'jbuilder', '~> 1.2' # To use ActiveModel has_secure_password # gem 'bcrypt-ruby', '~> 3.0.0' diff --git a/guides/code/getting_started/Gemfile.lock b/guides/code/getting_started/Gemfile.lock index 823fac5ff7..888a6b30e2 100644 --- a/guides/code/getting_started/Gemfile.lock +++ b/guides/code/getting_started/Gemfile.lock @@ -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) diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index f6bd107eba..10bb2c9d5d 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' # To use ActiveModel has_secure_password # gem 'bcrypt-ruby', '~> 3.0.0' |