From 3d964b7bcfbcea5f59efc83e658ab8fc5998d477 Mon Sep 17 00:00:00 2001 From: wvengen Date: Sat, 11 Apr 2015 01:22:21 +0200 Subject: [PATCH] Bundle update --- Gemfile.lock | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 11b06e3f..422a66d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -120,14 +120,14 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - childprocess (0.5.5) + childprocess (0.5.6) ffi (~> 1.0, >= 1.0.11) chronic (0.10.2) coderay (1.1.0) coffee-rails (4.1.0) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.3.0) + coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.9.1) @@ -135,7 +135,7 @@ GEM commonjs (0.2.7) connection_pool (2.1.3) content_for_in_controllers (0.0.2) - coveralls (0.7.11) + coveralls (0.8.0) multi_json (~> 1.10) rest-client (>= 1.6.8, < 2) simplecov (~> 0.9.1) @@ -154,12 +154,14 @@ GEM diff-lcs (1.2.5) diffy (3.0.7) docile (1.1.5) + domain_name (0.5.23) + unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) eventmachine (1.0.5) - exception_notification (4.0.1) + exception_notification (4.1.0) actionmailer (>= 3.0.4) activesupport (>= 3.0.4) - execjs (2.4.0) + execjs (2.5.2) expression_parser (0.9.0) factory_girl (4.5.0) activesupport (>= 3.0.0) @@ -169,7 +171,7 @@ GEM faker (1.4.3) i18n (~> 0.5) ffi (1.9.8) - globalid (0.3.3) + globalid (0.3.5) activesupport (>= 4.1.0) haml (4.0.6) tilt @@ -188,6 +190,9 @@ GEM haml (~> 4.0.0) nokogiri (~> 1.6.0) ruby_parser (~> 3.5) + htmlentities (4.3.3) + http-cookie (1.0.2) + domain_name (~> 0.5) i18n (0.7.0) i18n-js (3.0.0.rc9) i18n (~> 0.6) @@ -240,11 +245,11 @@ GEM nokogiri (1.6.6.2) mini_portile (~> 0.6.0) pdf-core (0.5.1) - polyamorous (1.1.0) + polyamorous (1.2.0) activerecord (>= 3.0) polyglot (0.3.5) - prawn (2.0.0) - pdf-core (~> 0.5.0) + prawn (2.0.1) + pdf-core (~> 0.5.1) ttfunk (~> 1.4.0) prawn-table (0.2.1) protected_attributes (1.0.9) @@ -300,12 +305,12 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.4.2) - ransack (1.6.4) + ransack (1.6.6) actionpack (>= 3.0) activerecord (>= 3.0) activesupport (>= 3.0) i18n - polyamorous (~> 1.1) + polyamorous (~> 1.2) recurring_select (1.3.0) coffee-rails (>= 3.1) ice_cube (>= 0.11) @@ -313,7 +318,7 @@ GEM rails (>= 3.2) sass-rails (>= 3.1) redis (3.2.1) - redis-namespace (1.5.1) + redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) ref (1.0.5) responders (2.1.0) @@ -324,7 +329,8 @@ GEM redis-namespace (~> 1.3) sinatra (>= 0.9.2) vegas (~> 0.1.2) - rest-client (1.7.3) + rest-client (1.8.0) + http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) rspec (2.99.0) @@ -354,7 +360,7 @@ GEM sexp_processor (~> 4.1) rubyzip (1.1.7) sass (3.4.13) - sass-rails (5.0.1) + sass-rails (5.0.3) railties (>= 4.0.0, < 5.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) @@ -381,10 +387,10 @@ GEM multi_json (~> 1.0) simplecov-html (~> 0.9.0) simplecov-html (0.9.0) - sinatra (1.4.5) + sinatra (1.4.6) rack (~> 1.4) rack-protection (~> 1.4) - tilt (~> 1.3, >= 1.3.4) + tilt (>= 1.3, < 3) skinny (0.2.3) eventmachine (~> 1.0.0) thin (~> 1.5.0) @@ -405,7 +411,7 @@ GEM net-ssh (>= 2.8.0) term-ansicolor (1.3.0) tins (~> 1.0) - therubyracer (0.12.1) + therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref thin (1.5.1) @@ -443,9 +449,11 @@ GEM websocket (1.2.1) whenever (0.9.4) chronic (>= 0.6.3) - wikicloth (0.8.2) + wikicloth (0.8.3) builder expression_parser + htmlentities + nokogiri twitter-text xpath (2.0.0) nokogiri (~> 1.3) @@ -510,7 +518,7 @@ DEPENDENCIES sass-rails select2-rails selenium-webdriver - simple-navigation + simple-navigation (~> 3.14.0) simple-navigation-bootstrap simple_form simplecov