From 58e0393efae70beccacf5dea1d4e260a9bd7ed23 Mon Sep 17 00:00:00 2001
From: Reinier Balt <lrbalt@gmail.com>
Date: Sun, 28 Jul 2013 13:36:47 +0200
Subject: [PATCH] add json as dependency

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

diff --git a/Gemfile b/Gemfile
index 635437dd..6916ff08 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,6 +4,8 @@ gem 'rails', '~>4.0.0'
 gem 'sass-rails', '~>4.0.0'
 gem 'coffee-rails', '~>4.0.0'
 
+gem 'json'
+
 # todo: remove xml api 
 gem 'actionpack-xml_parser', git: 'https://github.com/rails/actionpack-xml_parser'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index ad8276be..eef07d5f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -93,6 +93,7 @@ GEM
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
+    json (1.8.0)
     libv8 (3.11.8.17)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -208,6 +209,7 @@ DEPENDENCIES
   factory_girl_rails
   htmlentities
   jquery-rails
+  json
   mocha
   mysql2
   rack-mini-profiler