Merge pull request #11 from karlentwistle/bug/unable_to_bundle

Fix bundle
adambutler · Nov 28, 2016 · 29c0078 · 29c0078
2 parents 9cf5b2b + 724d430
commit 29c0078
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+2.3.3
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -89,7 +89,7 @@ GEM
       activesupport (>= 3.0)
       request_store (~> 1.0.3)
     erubis (2.7.0)
-    eventmachine (1.0.3)
+    eventmachine (1.0.4)
     excon (0.40.0)
     execjs (2.2.2)
     faraday (0.9.0)
@@ -138,7 +138,7 @@ GEM
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
+    json (1.8.2)
     jwt (1.0.0)
     kaminari (0.16.1)
       actionpack (>= 3.0.0)
@@ -157,7 +157,7 @@ GEM
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    mysql2 (0.3.16)
+    mysql2 (0.4.5)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.1)
@@ -328,3 +328,6 @@ DEPENDENCIES
   thin (~> 1.6.1)
   turbolinks
   uglifier (>= 1.3.0)
+
+BUNDLED WITH
+   1.13.6