From 1fe30b8d22173199fba9cf858ef641f9ed6f0615 Mon Sep 17 00:00:00 2001
From: Rafael Reggiani Manzo <rr.manzo@gmail.com>
Date: Sat, 4 Jan 2014 20:54:20 -0200
Subject: [PATCH] jbuilder updated

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0d4dde1..e34334d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,7 +28,7 @@ gem 'jquery-rails'
 gem 'turbolinks'
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 1.2'
+gem 'jbuilder', '~> 2.0.2'
 
 # For user authentication and everything else
 gem 'devise', '~> 3.2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index bfc27b4..9872827 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -111,7 +111,7 @@ GEM
       rack
       rubyntlm (~> 0.3.2)
     i18n (0.6.9)
-    jbuilder (1.5.3)
+    jbuilder (2.0.2)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
     jquery-rails (3.0.4)
@@ -280,7 +280,7 @@ DEPENDENCIES
   devise (~> 3.2.0)
   factory_girl_rails (~> 4.3.0)
   gruff (~> 0.5.1)
-  jbuilder (~> 1.2)
+  jbuilder (~> 2.0.2)
   jquery-rails
   jquery-ui-rails (~> 4.1.0)
   kalibro_gem (~> 0.0.1.rc7)
--
libgit2 0.21.2