aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-04 05:25:30 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-04 05:25:30 -0700
commitcc50aab3babfac508b03e6f6a21a101ef9c12929 (patch)
treea533b3fff23d6d96d2dffa8ab312893c7e46fca8 /guides
parent8c4a9c0ad8afa9d700d9a1bb89da2b2a9dc89423 (diff)
parentcf733bce5e14f42f0bf4c91b00fa0de9aadc1cfb (diff)
downloadrails-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 'guides')
-rw-r--r--guides/code/getting_started/Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
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)