From 61a1efdfcf59dc991721433466c4160419bf35bc Mon Sep 17 00:00:00 2001 From: wvengen Date: Tue, 19 Aug 2014 10:50:10 +0200 Subject: [PATCH] bundle update --- Gemfile.lock | 140 ++++++++++++++++++++++++++------------------------- 1 file changed, 71 insertions(+), 69 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 366fc3b4..88b81130 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,9 +13,9 @@ GIT GIT remote: git://github.com/fnando/i18n-js.git - revision: 1c412409377ee6c005573eeb0f288545414d9011 + revision: 9fd4cc6de4601dc496e676521fcde78532a63ccf specs: - i18n-js (3.0.0.rc5) + i18n-js (3.0.0.rc6) i18n (~> 0.6) GIT @@ -53,34 +53,34 @@ PATH GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.5) - actionpack (= 4.0.5) + actionmailer (4.0.9) + actionpack (= 4.0.9) mail (~> 2.5.4) - actionpack (4.0.5) - activesupport (= 4.0.5) + actionpack (4.0.9) + activesupport (= 4.0.9) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.5) - activesupport (= 4.0.5) + activemodel (4.0.9) + activesupport (= 4.0.9) builder (~> 3.1.0) - activerecord (4.0.5) - activemodel (= 4.0.5) + activerecord (4.0.9) + activemodel (= 4.0.9) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.5) + activesupport (= 4.0.9) arel (~> 4.0.0) activerecord-deprecated_finders (1.0.3) - activesupport (4.0.5) + activesupport (4.0.9) i18n (~> 0.6, >= 0.6.9) minitest (~> 4.2) multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) - acts_as_tree (1.6.1) + acts_as_tree (2.0.0) activerecord (>= 3.0.0) arel (4.0.2) - attribute_normalizer (1.1.0) + attribute_normalizer (1.2.0) better_errors (1.1.0) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -89,16 +89,16 @@ GEM bootstrap-datepicker-rails (1.3.0.2) railties (>= 3.0) builder (3.1.4) - bullet (4.10.0) - activesupport - uniform_notifier (~> 1.6.0) + bullet (4.13.1) + activesupport (>= 3.0.0) + uniform_notifier (>= 1.6.0) callsite (0.0.11) capistrano (3.2.1) i18n rake (>= 10.0.0) sshkit (~> 1.3) - capistrano-bundler (1.1.2) - capistrano (~> 3.0) + capistrano-bundler (1.1.3) + capistrano (~> 3.1) sshkit (~> 1.2) capistrano-rails (1.1.1) capistrano (~> 3.1) @@ -106,7 +106,7 @@ GEM capistrano-rvm (0.1.1) capistrano (~> 3.0) sshkit (~> 1.2) - capybara (2.3.0) + capybara (2.4.1) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -119,15 +119,15 @@ GEM coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.2.0) + coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.7.0) + coffee-script-source (1.7.1) colorize (0.7.3) commonjs (0.2.7) connection_pool (2.0.0) content_for_in_controllers (0.0.2) - coveralls (0.7.0) + coveralls (0.7.1) multi_json (~> 1.3) rest-client simplecov (>= 0.7) @@ -143,21 +143,21 @@ GEM nokogiri (~> 1.6.0) rails (>= 3.1) diff-lcs (1.2.5) - diffy (3.0.4) - docile (1.1.3) + diffy (3.0.6) + docile (1.1.5) erubis (2.7.0) eventmachine (1.0.3) exception_notification (4.0.1) actionmailer (>= 3.0.4) activesupport (>= 3.0.4) - execjs (2.2.0) + execjs (2.2.1) expression_parser (0.9.0) factory_girl (4.4.0) activesupport (>= 3.0.0) factory_girl_rails (4.4.1) factory_girl (~> 4.4.0) railties (>= 3.0.0) - faker (1.3.0) + faker (1.4.3) i18n (~> 0.5) ffi (1.9.3) haml (4.0.5) @@ -171,19 +171,19 @@ GEM actionpack (>= 3.2, < 5) activesupport (>= 3.2, < 5) hike (1.2.3) - i18n (0.6.9) - i18n-spec (0.4.1) + i18n (0.6.11) + i18n-spec (0.5.1) iso inherited_resources (1.5.0) has_scope (~> 0.6.0.rc) responders (~> 1.0) iso (0.2.1) i18n - jquery-rails (3.1.0) + jquery-rails (3.1.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) - kaminari (0.15.1) + kaminari (0.16.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) less (2.5.1) @@ -205,10 +205,10 @@ GEM skinny (>= 0.1.2) sqlite3-ruby thin - meta_request (0.3.0) - callsite - rack-contrib - railties + meta_request (0.3.4) + callsite (~> 0.0, >= 0.0.11) + rack-contrib (~> 1.1) + railties (>= 3.0.0, < 5.0.0) mime-types (1.25.1) mini_portile (0.6.0) minitest (4.7.5) @@ -218,18 +218,19 @@ GEM net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (2.9.1) - nokogiri (1.6.2.1) + netrc (0.7.7) + nokogiri (1.6.3.1) mini_portile (= 0.6.0) pdf-core (0.2.5) polyamorous (1.0.0) activerecord (>= 3.0) polyglot (0.3.5) - prawn (1.0.0) - pdf-core (~> 0.2.2) - ttfunk (~> 1.1.1) - protected_attributes (1.0.7) + prawn (1.2.1) + pdf-core (~> 0.2.5) + ttfunk (~> 1.2.0) + protected_attributes (1.0.8) activemodel (>= 4.0.1, < 5.0) - quiet_assets (1.0.2) + quiet_assets (1.0.3) railties (>= 3.1, < 5.0) rack (1.5.2) rack-contrib (1.1.0) @@ -238,14 +239,14 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (4.0.5) - actionmailer (= 4.0.5) - actionpack (= 4.0.5) - activerecord (= 4.0.5) - activesupport (= 4.0.5) + rails (4.0.9) + actionmailer (= 4.0.9) + actionpack (= 4.0.9) + activerecord (= 4.0.9) + activesupport (= 4.0.9) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.5) - sprockets-rails (~> 2.0.0) + railties (= 4.0.9) + sprockets-rails (~> 2.0) rails-assets-listjs (0.2.0.beta.4) railties (>= 3.1) rails-i18n (4.0.2) @@ -253,9 +254,9 @@ GEM rails (>= 4.0) rails-settings-cached (0.4.1) rails (>= 4.0.0) - railties (4.0.5) - actionpack (= 4.0.5) - activesupport (= 4.0.5) + railties (4.0.9) + actionpack (= 4.0.9) + activesupport (= 4.0.9) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.3.2) @@ -265,20 +266,21 @@ GEM activesupport (>= 3.0) i18n polyamorous (~> 1.0.0) - redis (3.0.7) - redis-namespace (1.4.1) - redis (~> 3.0.4) + redis (3.1.0) + redis-namespace (1.5.1) + redis (~> 3.0, >= 3.0.4) ref (1.0.5) - responders (1.1.0) - railties (>= 3.2, < 5) + responders (1.1.1) + railties (>= 3.2, < 4.2) resque (1.25.2) mono_logger (~> 1.0) multi_json (~> 1.0) redis-namespace (~> 1.3) sinatra (>= 0.9.2) vegas (~> 0.1.2) - rest-client (1.6.7) - mime-types (>= 1.16) + rest-client (1.7.2) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) rinku (1.7.3) rspec (2.14.1) rspec-core (~> 2.14.0) @@ -296,18 +298,18 @@ GEM rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) - rspec-rerun (0.1.3) - rspec (>= 2.11.0) + rspec-rerun (0.2.0) + rspec (>= 2.11.0, < 3) ruby-prof (0.15.1) ruby-units (1.4.5) - rubyzip (1.1.4) + rubyzip (1.1.6) sass (3.2.19) sass-rails (4.0.3) railties (>= 4.0.0, < 5.0) sass (~> 3.2.0) sprockets (~> 2.8, <= 2.11.0) sprockets-rails (~> 2.0) - select2-rails (3.5.7) + select2-rails (3.5.9.1) thor (~> 0.14) selenium-webdriver (2.42.0) childprocess (>= 0.5.0) @@ -322,7 +324,7 @@ GEM simple_form (3.0.2) actionpack (~> 4.0) activemodel (~> 4.0) - simplecov (0.8.2) + simplecov (0.9.0) docile (~> 1.1.0) multi_json simplecov-html (~> 0.8.0) @@ -339,7 +341,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.1) + sprockets-rails (2.1.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) @@ -362,21 +364,21 @@ GEM thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) - tins (1.3.0) + tins (1.3.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) - ttfunk (1.1.1) + ttfunk (1.2.0) twitter-bootstrap-rails (2.2.8) actionpack (>= 3.1) execjs rails (>= 3.1) railties (>= 3.1) - tzinfo (0.3.39) - uglifier (2.5.0) + tzinfo (0.3.41) + uglifier (2.5.3) execjs (>= 0.3.0) json (>= 1.8.0) - uniform_notifier (1.6.1) + uniform_notifier (1.6.2) vegas (0.1.11) rack (>= 1.0.0) websocket (1.0.7)