diff --git a/Gemfile.lock b/Gemfile.lock index 9298d0b..edc31f9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,7 +28,8 @@ GEM activesupport (3.2.11) i18n (~> 0.6) multi_json (~> 1.0) - addressable (2.2.7) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) ansi (1.4.2) arel (3.0.2) builder (3.0.4) @@ -48,6 +49,7 @@ GEM coffee-script-source execjs coffee-script-source (1.4.0) + concurrent-ruby (1.1.5) daemons (1.1.4) diff-lcs (1.1.3) dynamic_form (1.1.4) @@ -58,28 +60,23 @@ GEM ffi (1.0.11) haml (3.1.4) hashie (1.2.0) - heroku (2.21.2) - launchy (>= 0.3.2) - rest-client (~> 1.6.1) - rubyzip - term-ansicolor (~> 1.0.5) - hike (1.2.1) - i18n (0.6.1) + heroku (3.99.4) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) - jquery-rails (1.0.19) - railties (~> 3.0) - thor (~> 0.14) - json (1.7.6) - launchy (2.0.5) - addressable (~> 2.2.6) + jquery-rails (3.1.5) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.8.6) libwebsocket (0.1.3) addressable mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.19) - multi_json (1.5.0) + mime-types (1.25.1) + multi_json (1.14.0) nokogiri (1.5.2) oauth (0.4.5) omniauth (1.0.3) @@ -92,12 +89,13 @@ GEM omniauth-oauth (~> 1.0) pg (0.13.2) polyglot (0.3.3) - rack (1.4.3) - rack-cache (1.2) + public_suffix (4.0.1) + 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.2) + rack-test (0.6.3) rack (>= 1.0) rails (3.2.11) actionmailer (= 3.2.11) @@ -115,11 +113,9 @@ GEM rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) rake (10.0.3) - rdoc (3.12) + rdoc (3.12.2) json (~> 1.4) redcarpet (2.1.0) - rest-client (1.6.7) - mime-types (>= 1.16) rspec (2.8.0) rspec-core (~> 2.8.0) rspec-expectations (~> 2.8.0) @@ -133,7 +129,7 @@ GEM activesupport (>= 3.0) railties (>= 3.0) rspec (~> 2.8.0) - rubyzip (0.9.6.1) + rubyzip (2.0.0) sass (3.2.5) sass-rails (3.2.5) railties (~> 3.2.0) @@ -147,19 +143,18 @@ GEM rubyzip shoulda-matchers (1.1.0) activesupport (>= 3.0.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.5) - term-ansicolor (1.0.7) thin (1.3.1) daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.16.0) - tilt (1.3.3) + thor (0.20.3) + tilt (1.4.1) treetop (1.4.12) polyglot polyglot (>= 0.3.1)