diff --git a/Gemfile.lock b/Gemfile.lock index 83be720..133c16f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -69,6 +69,7 @@ GEM compass (>= 0.12.2, < 0.14) compass-susy-plugin (0.9) compass (>= 0.11.1) + concurrent-ruby (1.1.6) cucumber (1.3.20) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -123,7 +124,8 @@ GEM thor (>= 0.18.1) hashie (3.4.4) hike (1.2.3) - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jasmine (2.3.1) jasmine-core (~> 2.3) phantomjs @@ -137,7 +139,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - json (1.8.3) + json (2.3.1) jwt (1.5.4) kgio (2.10.0) language_list (1.1.0) @@ -152,7 +154,7 @@ GEM method_source (0.8.2) mime-types (1.25.1) minitest (4.7.5) - multi_json (1.12.1) + multi_json (1.15.0) multi_test (0.1.2) multi_xml (0.5.5) multipart-post (2.0.0) @@ -207,7 +209,7 @@ GEM slop (~> 3.4) puma (2.15.3) rack (1.4.7) - rack-cache (1.5.1) + rack-cache (1.9.0) rack (>= 0.4) rack-ssl (1.3.4) rack @@ -242,8 +244,7 @@ GEM rb-fsevent (0.9.6) rb-inotify (0.9.5) ffi (>= 0.5.0) - rdoc (3.12.2) - json (~> 1.4) + rdoc (3.9.5) require_all (1.3.3) rspec (2.8.0) rspec-core (~> 2.8.0) @@ -288,7 +289,7 @@ GEM sqlite3 (1.3.11) test-unit (3.2.0) power_assert - thor (0.19.1) + thor (0.19.4) tilt (1.4.1) treetop (1.4.15) polyglot