diff --git a/Gemfile.lock b/Gemfile.lock index 39781e0..6cb568a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -54,6 +54,7 @@ GEM coffee-script-source execjs coffee-script-source (1.6.3) + concurrent-ruby (1.1.5) cucumber (1.3.6) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -89,12 +90,13 @@ GEM gherkin (2.12.1) multi_json (~> 1.3) hike (1.2.3) - i18n (0.6.5) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) - jquery-rails (3.0.4) + jquery-rails (3.1.3) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.0) + json (1.8.6) launchy (2.3.0) addressable (~> 2.3) mail (2.5.4) @@ -110,12 +112,12 @@ GEM polyglot (0.3.3) quiet_assets (1.0.2) railties (>= 3.1, < 5.0) - rack (1.4.5) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.9.0) rack (>= 0.4) - rack-ssl (1.3.3) + rack-ssl (1.3.4) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (3.2.14) actionmailer (= 3.2.14) @@ -132,7 +134,7 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.1.0) + rake (12.3.3) rdoc (3.12.2) json (~> 1.4) rolify (3.2.0) @@ -155,13 +157,13 @@ GEM simple_form (2.1.0) actionpack (~> 3.0) activemodel (~> 3.0) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.8) - thor (0.18.1) + thor (0.20.3) tilt (1.4.1) treetop (1.4.15) polyglot