diff --git a/Gemfile.lock b/Gemfile.lock index 6b1ff28..1c86c1d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,7 +50,7 @@ GEM bcrypt-ruby (3.0.1) bootstrap-sass (1.4.4) sass-rails (~> 3.1) - builder (3.0.0) + builder (3.0.4) capybara (1.1.2) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -71,6 +71,7 @@ GEM coffee-script-source execjs coffee-script-source (1.2.0) + concurrent-ruby (1.2.2) configatron (2.9.0) yamler (>= 0.1.0) cover_me (1.2.0) @@ -101,15 +102,16 @@ GEM haml (~> 3.0) railties (~> 3.0) hashie (1.2.0) - hike (1.2.1) + hike (1.2.3) hirb (0.6.0) hpricot (0.8.6) - i18n (0.6.0) - journey (1.0.1) - jquery-rails (2.0.0) - railties (>= 3.2.0.beta, < 5.0) - thor (~> 0.14) - json (1.6.5) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + journey (1.0.4) + jquery-rails (3.1.5) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.8.6) kaminari (0.13.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -136,15 +138,15 @@ GEM yard (~> 0.7.4) pry-nav (0.1.0) pry (~> 0.9.8.1) - rack (1.4.1) - rack-cache (1.1) + rack (1.4.7) + rack-cache (1.14.0) rack (>= 0.4) rack-pjax (0.5.7) hpricot (~> 0.8.6) rack (~> 1.3) - 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.1) actionmailer (= 3.2.1) @@ -161,8 +163,8 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) - rake (0.9.2.2) - rdoc (3.12) + rake (13.0.6) + rdoc (3.12.2) json (~> 1.4) remotipart (1.0.1) rest-client (1.6.7) @@ -192,7 +194,7 @@ GEM multi_json (~> 1.0.4) rubyzip slop (2.4.4) - sprockets (2.1.2) + sprockets (2.1.4) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) @@ -201,7 +203,7 @@ GEM rest-client (~> 1.4) syntax (1.0.0) thor (0.14.6) - tilt (1.3.3) + tilt (1.4.1) treetop (1.4.10) polyglot polyglot (>= 0.3.1)