From befb344427c31130c1f94d666e5dfd207f4c851a Mon Sep 17 00:00:00 2001
From: Leandro Nunes dos Santos <leandronunes@gmail.com>
Date: Mon, 10 Aug 2015 17:38:00 -0300
Subject: [PATCH] HOTSPOT: updating gemfile.lock

---
 Gemfile.lock | 14 ++++++++++++++
 1 file changed, 14 insertions(+), 0 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ebd7b60..35dadea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -39,6 +39,8 @@ GEM
       multi_json (~> 1.0)
     acts-as-taggable-on (3.4.4)
       activerecord (>= 3.2, < 5)
+    addressable (2.3.8)
+    ambry (0.3.1)
     api-pagination (4.1.1)
     arel (3.0.3)
     axiom-types (0.1.1)
@@ -57,6 +59,8 @@ GEM
     chronic (0.10.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
     cucumber (1.0.6)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -119,6 +123,8 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    merit (2.3.2)
+      ambry (~> 0.3.0)
     metaclass (0.0.4)
     mime-types (1.25.1)
     mini_portile (0.6.2)
@@ -206,6 +212,7 @@ GEM
     ruby-feedparser (0.9.3)
       magic
     rubyzip (1.1.7)
+    safe_yaml (1.0.4)
     sass (3.4.15)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
@@ -238,11 +245,15 @@ GEM
     uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    vcr (2.9.3)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
+    webmock (1.21.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
     websocket (1.0.7)
     whenever (0.9.4)
       chronic (>= 0.6.3)
@@ -272,6 +283,7 @@ DEPENDENCIES
   grape_logging!
   liquid (~> 3.0.3)
   locale (~> 2.0.5)
+  merit (~> 2.3.1)
   minitest (~> 3.2.0)
   mocha (~> 1.1.0)
   nokogiri (~> 1.6.0)
@@ -293,5 +305,7 @@ DEPENDENCIES
   selenium-webdriver (~> 2.39.0)
   thin (~> 1.3.1)
   uglifier (>= 1.0.3)
+  vcr
+  webmock
   whenever
   will_paginate (~> 3.0.3)
--
libgit2 0.21.2