From fa67ec044473a114728272684180f71d0807abaa Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Thu, 10 Sep 2015 17:43:48 +0800
Subject: [PATCH] update Gemfile for rails 4

---
 Gemfile      | 3 +++
 Gemfile.lock | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/Gemfile b/Gemfile
index d54d13d2..c7ec0462 100644
--- a/Gemfile
+++ b/Gemfile
@@ -51,3 +51,6 @@ group :development, :test do
   gem 'quiet_assets'
   gem 'tunemygc'
 end
+
+# To use Jbuilder templates for JSON
+gem 'jbuilder'
diff --git a/Gemfile.lock b/Gemfile.lock
index f1c8c7c9..d44f02fa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,6 +42,12 @@ GEM
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
+    aws-sdk (2.1.19)
+      aws-sdk-resources (= 2.1.19)
+    aws-sdk-core (2.1.19)
+      jmespath (~> 1.0)
+    aws-sdk-resources (2.1.19)
+      aws-sdk-core (= 2.1.19)
     bcrypt (3.1.10)
     best_in_place (3.0.3)
       actionpack (>= 3.2)