Merge pull request #7087 from jvanbaarsen/gemfilefix

Gemfile fix

Merge pull request #7087 from jvanbaarsen/gemfilefix
Gemfile fix
f7cf0286 · Dmitriy Zaporozhets · db779388 · 9bca8ae8 · f7cf0286
Commit f7cf0286 authored Jun 05, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

Gemfile.lock Gemfile.lock +6 -6

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -219,12 +219,12 @@ GEM
      lumberjack (~> 1.0)
      pry (>= 0.9.12)
      thor (>= 0.18.1)
-    guard-rspec (4.2.0)
-      guard (>= 2.1.1)
-      rspec (>= 2.14, < 4.0)
    guard-spinach (0.0.2)
      guard (>= 1.1)
      spinach
+    guard-spinachrspec (4.2.0)
+      guard (>= 2.1.1)
+      rspec (>= 2.14, < 4.0)
    haml (4.0.5)
      tilt
    haml-rails (0.5.3)
@@ -283,9 +283,9 @@ GEM
      treetop (~> 1.4.8)
    method_source (0.8.2)
    mime-types (1.25.1)
-    mini_portile (0.5.3)
+    mini_portile (0.6.0)
-    minitest (4.7.5)
+    minitest (5.3.4)
-    multi_json (1.10.0)
+    multi_json (1.10.1)
    multi_xml (0.5.5)
    multipart-post (1.2.0)
    mysql2 (0.3.16)