diff --git a/Gemfile.lock b/Gemfile.lock index 0c15513..1286cb5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,7 +32,7 @@ GEM annotate (2.4.1.beta1) arel (3.0.2) bcrypt-ruby (3.0.1) - builder (3.0.0) + builder (3.0.4) capybara (1.1.2) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -51,6 +51,7 @@ GEM coffee-script-source execjs coffee-script-source (1.3.1) + concurrent-ruby (1.1.5) database_cleaner (0.7.2) diff-lcs (1.1.3) erubis (2.7.0) @@ -82,18 +83,19 @@ GEM activesupport (~> 3.0) haml (~> 3.0) railties (~> 3.0) - hike (1.2.1) + hike (1.2.3) httparty (0.8.3) multi_json (~> 1.0) multi_xml - i18n (0.6.0) - journey (1.0.3) - jquery-rails (2.0.2) - railties (>= 3.2.0, < 5.0) - thor (~> 0.14) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + journey (1.0.4) + jquery-rails (3.1.3) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) jquery-ui-themes (0.0.5) httparty - json (1.7.0) + json (1.8.6) libv8 (3.3.10.4) libwebsocket (0.1.3) addressable @@ -103,7 +105,7 @@ GEM treetop (~> 1.4.8) method_source (0.7.1) mime-types (1.18) - multi_json (1.3.4) + multi_json (1.14.0) multi_xml (0.5.1) nokogiri (1.5.2) pg (0.13.2) @@ -114,12 +116,12 @@ GEM slop (>= 2.4.4, < 3) puma (1.2.2) rack (~> 1.2) - rack (1.4.1) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.9.0) rack (>= 0.4) - rack-ssl (1.3.2) + rack-ssl (1.3.4) rack - rack-test (0.6.1) + rack-test (0.6.3) rack (>= 1.0) rails (3.2.3) actionmailer (= 3.2.3) @@ -138,9 +140,9 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) - rake (0.9.2.2) + rake (13.0.0) rb-fsevent (0.9.1) - rdoc (3.12) + rdoc (3.12.2) json (~> 1.4) rspec (2.9.0) rspec-core (~> 2.9.0) @@ -174,7 +176,7 @@ GEM activemodel (~> 3.0) slop (2.4.4) spork (0.9.0) - sprockets (2.1.3) + sprockets (2.1.4) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) @@ -182,7 +184,7 @@ GEM therubyracer (0.10.1) libv8 (~> 3.3.10) thor (0.14.6) - tilt (1.3.3) + tilt (1.4.1) treetop (1.4.10) polyglot polyglot (>= 0.3.1)