From e4f68acf0aa0013f04c970d5e3e9ee5b826486ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 24 Nov 2014 16:27:24 +0100 Subject: [PATCH 1/7] bump rails --- Gemfile | 2 +- Gemfile.lock | 56 ++++++++++++++++++++++++++-------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Gemfile b/Gemfile index 62b65e745..63a8e5b59 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' source 'https://rails-assets.org' -gem 'rails', '4.1.7' +gem 'rails', '4.1.8' # Legacy Rails features, remove me! diff --git a/Gemfile.lock b/Gemfile.lock index d43641d17..2c3657b92 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,29 +2,29 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - actionmailer (4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) + actionmailer (4.1.8) + actionpack (= 4.1.8) + actionview (= 4.1.8) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.7) - actionview (= 4.1.7) - activesupport (= 4.1.7) + actionpack (4.1.8) + actionview (= 4.1.8) + activesupport (= 4.1.8) rack (~> 1.5.2) rack-test (~> 0.6.2) actionpack-action_caching (1.1.1) actionpack (>= 4.0.0, < 5.0) actionpack-page_caching (1.0.2) actionpack (>= 4.0.0, < 5) - actionview (4.1.7) - activesupport (= 4.1.7) + actionview (4.1.8) + activesupport (= 4.1.8) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.7) - activesupport (= 4.1.7) + activemodel (4.1.8) + activesupport (= 4.1.8) builder (~> 3.1) - activerecord (4.1.7) - activemodel (= 4.1.7) - activesupport (= 4.1.7) + activerecord (4.1.8) + activemodel (= 4.1.8) + activesupport (= 4.1.8) arel (~> 5.0.0) activerecord-import (0.6.0) activerecord (>= 3.0) @@ -32,7 +32,7 @@ GEM activemodel (~> 4.0) activesupport (~> 4.0) rails-observers (~> 0.1.1) - activesupport (4.1.7) + activesupport (4.1.8) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -301,7 +301,7 @@ GEM mini_magick (3.8.1) subexec (~> 0.2.1) mini_portile (0.6.1) - minitest (5.4.2) + minitest (5.4.3) mobile-fu (1.3.1) rack-mobile-detect rails @@ -375,15 +375,15 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (4.1.7) - actionmailer (= 4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) - activemodel (= 4.1.7) - activerecord (= 4.1.7) - activesupport (= 4.1.7) + rails (4.1.8) + actionmailer (= 4.1.8) + actionpack (= 4.1.8) + actionview (= 4.1.8) + activemodel (= 4.1.8) + activerecord (= 4.1.8) + activesupport (= 4.1.8) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.7) + railties (= 4.1.8) sprockets-rails (~> 2.0) rails-assets-diaspora_jsxc (0.0.4) rails-assets-jquery (~> 1.11.1) @@ -430,9 +430,9 @@ GEM remotipart (~> 1.0) safe_yaml (~> 1.0) sass-rails (~> 4.0) - railties (4.1.7) - actionpack (= 4.1.7) - activesupport (= 4.1.7) + railties (4.1.8) + actionpack (= 4.1.8) + activesupport (= 4.1.8) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) @@ -514,7 +514,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.0) + sprockets-rails (2.2.1) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -629,7 +629,7 @@ DEPENDENCIES rack-protection (= 1.2) rack-rewrite (= 1.5.0) rack-ssl (= 1.4.1) - rails (= 4.1.7) + rails (= 4.1.8) rails-assets-diaspora_jsxc (~> 0.0.4) rails-assets-jeresig--jquery.hotkeys (= 0.2.0) rails-assets-jquery (= 1.11.1) From dca06ae075d1b87a5f60313e58c3c3f47596c68f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 24 Nov 2014 16:31:22 +0100 Subject: [PATCH 2/7] bump sidekiq --- Gemfile | 2 +- Gemfile.lock | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 63a8e5b59..a85f5fc8c 100644 --- a/Gemfile +++ b/Gemfile @@ -30,7 +30,7 @@ gem 'simple_captcha2', '0.3.2', :require => 'simple_captcha' # Background processing -gem 'sidekiq', '3.2.6' +gem 'sidekiq', '3.3.0' gem 'sinatra', '1.3.3' # Scheduled processing diff --git a/Gemfile.lock b/Gemfile.lock index 2c3657b92..a962caf18 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,8 +78,8 @@ GEM activesupport (>= 3.2.0) json (>= 1.7) mime-types (>= 1.16) - celluloid (0.15.2) - timers (~> 1.1.0) + celluloid (0.16.0) + timers (~> 4.0.0) childprocess (0.5.5) ffi (~> 1.0, >= 1.0.11) chunky_png (1.3.3) @@ -99,7 +99,7 @@ GEM compass-rails (2.0.0) compass (>= 0.12.2) configurate (0.2.0) - connection_pool (2.0.0) + connection_pool (2.1.0) crack (0.4.2) safe_yaml (~> 1.0.0) cucumber (1.3.17) @@ -249,6 +249,7 @@ GEM hashie (3.3.1) hike (1.2.3) hiredis (0.5.2) + hitimes (1.2.2) http_accept_language (2.0.2) http_parser.rb (0.6.0) i18n (0.6.11) @@ -488,8 +489,8 @@ GEM multi_json (~> 1.0) rubyzip (~> 1.0) websocket (~> 1.0) - sidekiq (3.2.6) - celluloid (= 0.15.2) + sidekiq (3.3.0) + celluloid (>= 0.16.0) connection_pool (>= 2.0.0) json redis (>= 3.0.6) @@ -526,7 +527,8 @@ GEM thread_safe (0.3.4) tilt (1.4.1) timecop (0.7.1) - timers (1.1.0) + timers (4.0.1) + hitimes twitter (4.8.1) faraday (~> 0.8, < 0.10) multi_json (~> 1.0) @@ -651,7 +653,7 @@ DEPENDENCIES ruby-oembed (= 0.8.11) sass-rails (= 4.0.4) selenium-webdriver (= 2.44.0) - sidekiq (= 3.2.6) + sidekiq (= 3.3.0) sidetiq (= 0.6.3) simple_captcha2 (= 0.3.2) sinatra (= 1.3.3) From 3d757abf6d298c88d2db2f76ba89e775236bd2cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 24 Nov 2014 16:34:37 +0100 Subject: [PATCH 3/7] bump mysql2 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a85f5fc8c..f72f602b5 100644 --- a/Gemfile +++ b/Gemfile @@ -59,7 +59,7 @@ gem 'sass-rails', '4.0.4' ENV['DB'] ||= 'mysql' -gem 'mysql2', '0.3.16' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql' +gem 'mysql2', '0.3.17' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql' gem 'pg', '0.17.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres' gem 'activerecord-import', '0.6.0' diff --git a/Gemfile.lock b/Gemfile.lock index a962caf18..fde0db63d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -310,7 +310,7 @@ GEM multi_test (0.1.1) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.3.16) + mysql2 (0.3.17) nested_form (0.3.2) net-scp (1.2.1) net-ssh (>= 2.6.5) @@ -614,7 +614,7 @@ DEPENDENCIES messagebus_ruby_api (= 1.0.3) mini_magick (= 3.8.1) mobile-fu (= 1.3.1) - mysql2 (= 0.3.16) + mysql2 (= 0.3.17) nokogiri (= 1.6.4.1) omniauth (= 1.2.2) omniauth-facebook (= 1.6.0) From 64b9a4769bc770737cf00cf20a52e6f75a62af24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 24 Nov 2014 16:38:38 +0100 Subject: [PATCH 4/7] bump fog --- Gemfile | 2 +- Gemfile.lock | 41 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index f72f602b5..066d1959e 100644 --- a/Gemfile +++ b/Gemfile @@ -68,7 +68,7 @@ gem 'foreigner', '1.6.1' # File uploading gem 'carrierwave', '0.10.0' -gem 'fog', '1.24.0' +gem 'fog', '1.25.0' gem 'mini_magick', '3.8.1' gem 'remotipart', '1.2.1' diff --git a/Gemfile.lock b/Gemfile.lock index fde0db63d..6573ae662 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,6 +2,7 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: + CFPropertyList (2.2.8) actionmailer (4.1.8) actionpack (= 4.1.8) actionview (= 4.1.8) @@ -167,23 +168,31 @@ GEM faraday_middleware (0.9.1) faraday (>= 0.7.4, < 0.10) ffi (1.9.6) + fission (0.5.0) + CFPropertyList (~> 2.2) fixture_builder (0.3.6) activerecord (>= 2) activesupport (>= 2) - fog (1.24.0) - fog-brightbox - fog-core (~> 1.23) + fog (1.25.0) + fog-brightbox (~> 0.4) + fog-core (~> 1.25) fog-json + fog-profitbricks fog-radosgw (>= 0.0.2) fog-sakuracloud (>= 0.0.4) fog-softlayer + fog-terremark + fog-vmfusion + fog-voxel + fog-xml (~> 0.1.1) ipaddress (~> 0.5) nokogiri (~> 1.5, >= 1.5.11) + opennebula fog-brightbox (0.6.1) fog-core (~> 1.22) fog-json inflecto - fog-core (1.24.0) + fog-core (1.25.0) builder excon (~> 0.38) formatador (~> 0.2) @@ -192,6 +201,10 @@ GEM net-ssh (>= 2.1.3) fog-json (1.0.0) multi_json (~> 1.0) + fog-profitbricks (0.0.1) + fog-core + fog-xml + nokogiri fog-radosgw (0.0.3) fog-core (>= 1.21.0) fog-json @@ -202,6 +215,15 @@ GEM fog-softlayer (0.3.24) fog-core fog-json + fog-terremark (0.0.3) + fog-core + fog-xml + fog-vmfusion (0.0.1) + fission + fog-core + fog-voxel (0.0.1) + fog-core + fog-xml fog-xml (0.1.1) fog-core nokogiri (~> 1.5, >= 1.5.11) @@ -347,6 +369,10 @@ GEM opengraph_parser (0.2.3) addressable nokogiri + opennebula (4.10.1) + json + nokogiri + rbvmomi orm_adapter (0.5.0) phantomjs (1.9.7.1) pry (0.10.1) @@ -441,6 +467,10 @@ GEM rb-fsevent (0.9.4) rb-inotify (0.9.5) ffi (>= 0.5.0) + rbvmomi (1.8.2) + builder + nokogiri (>= 1.4.1) + trollop redcarpet (3.2.0) redis (3.1.0) redis-namespace (1.5.1) @@ -529,6 +559,7 @@ GEM timecop (0.7.1) timers (4.0.1) hitimes + trollop (2.0) twitter (4.8.1) faraday (~> 0.8, < 0.10) multi_json (~> 1.0) @@ -591,7 +622,7 @@ DEPENDENCIES faraday (= 0.9.0) faraday_middleware (= 0.9.1) fixture_builder (= 0.3.6) - fog (= 1.24.0) + fog (= 1.25.0) foreigner (= 1.6.1) foreman (= 0.62) fuubar (= 2.0.0) From c2e355fce9aa34141e3685a968beb094e4031b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 24 Nov 2014 16:43:00 +0100 Subject: [PATCH 5/7] bump guard --- Gemfile | 4 ++-- Gemfile.lock | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 066d1959e..77d32c4b2 100644 --- a/Gemfile +++ b/Gemfile @@ -195,13 +195,13 @@ group :development do # Automatic test runs gem 'guard-cucumber', '1.5.1' gem 'guard-rspec', '4.3.1' - gem 'guard', '2.7.3', :require => false + gem 'guard', '2.8.2', :require => false gem 'rb-fsevent', '0.9.4', :require => false gem 'rb-inotify', '0.9.5', :require => false # Preloading environment - gem 'guard-spork', '1.5.1' + gem 'guard-spork', '2.0.1' gem 'spork', '1.0.0rc4' # Debugging diff --git a/Gemfile.lock b/Gemfile.lock index 6573ae662..4b26acbe9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -245,7 +245,7 @@ GEM json multi_json request_store (>= 1.0.5) - guard (2.7.3) + guard (2.8.2) formatador (>= 0.2.4) listen (~> 2.7) lumberjack (~> 1.0) @@ -257,9 +257,9 @@ GEM guard-rspec (4.3.1) guard (~> 2.1) rspec (>= 2.14, < 4.0) - guard-spork (1.5.1) + guard-spork (2.0.1) childprocess (>= 0.2.3) - guard (>= 1.1) + guard (~> 2.8.2) spork (>= 0.8.4) haml (4.0.5) tilt @@ -307,7 +307,7 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.9.2) - listen (2.7.11) + listen (2.8.1) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) @@ -627,10 +627,10 @@ DEPENDENCIES foreman (= 0.62) fuubar (= 2.0.0) gon (= 5.2.3) - guard (= 2.7.3) + guard (= 2.8.2) guard-cucumber (= 1.5.1) guard-rspec (= 4.3.1) - guard-spork (= 1.5.1) + guard-spork (= 2.0.1) haml (= 4.0.5) handlebars_assets (= 0.18.0) http_accept_language (= 2.0.2) From 5622f7242009b3f67e26e3d2b38feaa78df468d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 24 Nov 2014 16:44:39 +0100 Subject: [PATCH 6/7] bump jasmine --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 77d32c4b2..ac54190ab 100644 --- a/Gemfile +++ b/Gemfile @@ -240,7 +240,7 @@ group :development, :test do gem 'cucumber-rails', '1.4.2', :require => false # Jasmine (client side application tests (JS)) - gem 'jasmine', '2.0.3' + gem 'jasmine', '2.1.0' gem 'jasmine-jquery-rails', '2.0.3' gem 'sinon-rails', '1.10.3' end diff --git a/Gemfile.lock b/Gemfile.lock index 4b26acbe9..85fc83fd9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -284,12 +284,12 @@ GEM ice_cube (0.11.1) inflecto (0.0.2) ipaddress (0.8.0) - jasmine (2.0.3) - jasmine-core (~> 2.0.0) + jasmine (2.1.0) + jasmine-core (~> 2.1.0) phantomjs rack (>= 1.2.1) rake - jasmine-core (2.0.2) + jasmine-core (2.1.2) jasmine-jquery-rails (2.0.3) jquery-rails (3.1.2) railties (>= 3.0, < 5.0) @@ -635,7 +635,7 @@ DEPENDENCIES handlebars_assets (= 0.18.0) http_accept_language (= 2.0.2) i18n-inflector-rails (= 1.0.7) - jasmine (= 2.0.3) + jasmine (= 2.1.0) jasmine-jquery-rails (= 2.0.3) jquery-rails (= 3.1.2) js-routes (= 0.9.9) From c305293314c0383677e61d3c862e7bf1f71e81c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 24 Nov 2014 16:51:45 +0100 Subject: [PATCH 7/7] bump mini_magick --- Gemfile | 2 +- Gemfile.lock | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index ac54190ab..04e648d6e 100644 --- a/Gemfile +++ b/Gemfile @@ -69,7 +69,7 @@ gem 'foreigner', '1.6.1' gem 'carrierwave', '0.10.0' gem 'fog', '1.25.0' -gem 'mini_magick', '3.8.1' +gem 'mini_magick', '4.0.1' gem 'remotipart', '1.2.1' # GUID generation diff --git a/Gemfile.lock b/Gemfile.lock index 85fc83fd9..3e6e3e66e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -321,8 +321,7 @@ GEM messagebus_ruby_api (1.0.3) method_source (0.8.2) mime-types (2.4.3) - mini_magick (3.8.1) - subexec (~> 0.2.1) + mini_magick (4.0.1) mini_portile (0.6.1) minitest (5.4.3) mobile-fu (1.3.1) @@ -549,7 +548,6 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - subexec (0.2.3) systemu (2.6.4) test_after_commit (0.4.0) activerecord (>= 3.2) @@ -643,7 +641,7 @@ DEPENDENCIES json (= 1.8.1) markerb (= 1.0.2) messagebus_ruby_api (= 1.0.3) - mini_magick (= 3.8.1) + mini_magick (= 4.0.1) mobile-fu (= 1.3.1) mysql2 (= 0.3.17) nokogiri (= 1.6.4.1)