diff --git a/Gemfile.lock b/Gemfile.lock index e68ad7e..dbdad43 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,7 +28,8 @@ GEM activesupport (3.2.3) i18n (~> 0.6) multi_json (~> 1.0) - addressable (2.2.8) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) arel (3.0.2) builder (3.0.0) capybara (1.1.2) @@ -47,6 +48,7 @@ GEM coffee-script-source execjs coffee-script-source (1.3.3) + concurrent-ruby (1.1.5) cucumber (1.2.1) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -59,34 +61,28 @@ GEM database_cleaner (0.8.0) diff-lcs (1.1.3) erubis (2.7.0) - excon (0.14.3) + excon (0.25.3) execjs (1.4.0) multi_json (~> 1.0) ffi (1.0.11) gherkin (2.11.1) json (>= 1.4.6) - heroku (2.28.10) - heroku-api (~> 0.2.7) - launchy (>= 0.3.2) - netrc (~> 0.7.5) - rest-client (~> 1.6.1) - rubyzip - heroku-api (0.2.7) - excon (~> 0.14.3) + heroku (3.99.4) + heroku-api (0.3.15) + excon (~> 0.25.1) heroku_san (3.0.4) activesupport heroku (>= 2) heroku-api (>= 0.1.2) rake hike (1.2.1) - i18n (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) jquery-rails (2.0.2) railties (>= 3.2.0, < 5.0) thor (~> 0.14) json (1.7.3) - launchy (2.1.0) - addressable (~> 2.2.6) libv8 (3.3.10.4) libwebsocket (0.1.3) addressable @@ -94,12 +90,12 @@ GEM i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.19) + mime-types (1.25.1) multi_json (1.3.6) - netrc (0.7.5) nokogiri (1.5.5) pg (0.14.0) polyglot (0.3.3) + public_suffix (4.0.1) rack (1.4.1) rack-cache (1.2) rack (>= 0.4) @@ -125,8 +121,6 @@ GEM rake (0.9.2.2) rdoc (3.12) json (~> 1.4) - rest-client (1.6.7) - mime-types (>= 1.16) rspec (2.11.0) rspec-core (~> 2.11.0) rspec-expectations (~> 2.11.0) @@ -140,7 +134,7 @@ GEM activesupport (>= 3.0) railties (>= 3.0) rspec (~> 2.11.0) - rubyzip (0.9.9) + rubyzip (2.0.0) sass (3.1.20) sass-rails (3.2.5) railties (~> 3.2.0)