From e3b21f63e8a35e923f33a9f315a338969bcd5616 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 14:56:01 +0100 Subject: [PATCH 01/35] Bump active_model_serializers --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index f38e511d6..225059bc6 100644 --- a/Gemfile +++ b/Gemfile @@ -144,7 +144,7 @@ gem "omniauth-wordpress", "0.2.2" # Serializers -gem "active_model_serializers", "0.9.3" +gem "active_model_serializers", "0.9.4" # XMPP chat dependencies gem "diaspora-vines", "~> 0.2.0.develop" diff --git a/Gemfile.lock b/Gemfile.lock index 8cf58cf4d..ebba3276f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,7 +22,7 @@ GEM erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - active_model_serializers (0.9.3) + active_model_serializers (0.9.4) activemodel (>= 3.2) activejob (4.2.5.1) activesupport (= 4.2.5.1) @@ -773,7 +773,7 @@ PLATFORMS ruby DEPENDENCIES - active_model_serializers (= 0.9.3) + active_model_serializers (= 0.9.4) activerecord-import (= 0.10.0) acts-as-taggable-on (= 3.5.0) acts_as_api (= 0.4.2) From 9e0c818d9ac66bdced1b131caf13ab4d41e56cc7 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 14:58:58 +0100 Subject: [PATCH 02/35] Bump activerecord-import --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 225059bc6..3a2ccdda8 100644 --- a/Gemfile +++ b/Gemfile @@ -65,7 +65,7 @@ ENV["DB"] ||= "mysql" gem "mysql2", "0.3.20" if ENV["DB"] == "all" || ENV["DB"] == "mysql" gem "pg", "0.18.4" if ENV["DB"] == "all" || ENV["DB"] == "postgres" -gem "activerecord-import", "0.10.0" +gem "activerecord-import", "0.11.0" # File uploading diff --git a/Gemfile.lock b/Gemfile.lock index ebba3276f..30b0bb97d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,7 +34,7 @@ GEM activemodel (= 4.2.5.1) activesupport (= 4.2.5.1) arel (~> 6.0) - activerecord-import (0.10.0) + activerecord-import (0.11.0) activerecord (>= 3.0) activesupport (4.2.5.1) i18n (~> 0.7) @@ -774,7 +774,7 @@ PLATFORMS DEPENDENCIES active_model_serializers (= 0.9.4) - activerecord-import (= 0.10.0) + activerecord-import (= 0.11.0) acts-as-taggable-on (= 3.5.0) acts_as_api (= 0.4.2) addressable (= 2.3.8) From d6a400f8cbab8d100f1ae0bfb9791d61a0685401 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 15:04:14 +0100 Subject: [PATCH 03/35] Bump cucumber-rails --- Gemfile | 2 +- Gemfile.lock | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 3a2ccdda8..3a505a175 100644 --- a/Gemfile +++ b/Gemfile @@ -278,7 +278,7 @@ group :development, :test do gem "rspec-rails", "3.3.3" # Cucumber (integration tests) - gem "cucumber-rails", "1.4.2", require: false + gem "cucumber-rails", "1.4.3", require: false # Jasmine (client side application tests (JS)) gem "jasmine", "2.4.0" diff --git a/Gemfile.lock b/Gemfile.lock index 30b0bb97d..04e6e0f4b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -118,18 +118,23 @@ GEM connection_pool (2.2.0) crack (0.4.3) safe_yaml (~> 1.0.0) - cucumber (1.3.20) + cucumber (2.3.2) builder (>= 2.1.2) + cucumber-core (~> 1.4.0) + cucumber-wire (~> 0.0.1) diff-lcs (>= 1.1.3) - gherkin (~> 2.12) + gherkin (~> 3.2.0) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) - cucumber-rails (1.4.2) + cucumber-core (1.4.0) + gherkin (~> 3.2.0) + cucumber-rails (1.4.3) capybara (>= 1.1.2, < 3) - cucumber (>= 1.3.8, < 2) - mime-types (>= 1.16, < 3) + cucumber (>= 1.3.8, < 3) + mime-types (>= 1.16, < 4) nokogiri (~> 1.5) - rails (>= 3, < 5) + railties (>= 3, < 5) + cucumber-wire (0.0.1) database_cleaner (1.5.1) devise (3.5.5) bcrypt (~> 3.0) @@ -326,8 +331,7 @@ GEM fuubar (2.0.0) rspec (~> 3.0) ruby-progressbar (~> 1.4) - gherkin (2.12.2) - multi_json (~> 1.3) + gherkin (3.2.0) globalid (0.3.6) activesupport (>= 4.1.0) gon (6.0.1) @@ -786,7 +790,7 @@ DEPENDENCIES carrierwave (= 0.10.0) compass-rails (= 2.0.5) configurate (= 0.3.1) - cucumber-rails (= 1.4.2) + cucumber-rails (= 1.4.3) database_cleaner (= 1.5.1) devise (= 3.5.5) devise-token_authenticatable (~> 0.4.0) From 8180f6658cc1c872fee35468ab3b96203fd74684 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 16:03:41 +0100 Subject: [PATCH 04/35] Bump capybara --- Gemfile | 2 +- Gemfile.lock | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3a505a175..1b02a1da5 100644 --- a/Gemfile +++ b/Gemfile @@ -259,7 +259,7 @@ group :test do # Cucumber (integration tests) - gem "capybara", "2.5.0" + gem "capybara", "2.6.2" gem "database_cleaner" , "1.5.1" gem "selenium-webdriver", "2.47.1" diff --git a/Gemfile.lock b/Gemfile.lock index 04e6e0f4b..6d1509ba8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -71,7 +71,8 @@ GEM buftok (0.2.0) builder (3.2.2) byebug (8.2.1) - capybara (2.5.0) + capybara (2.6.2) + addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -786,7 +787,7 @@ DEPENDENCIES autoprefixer-rails (= 6.3.1) backbone-on-rails (= 1.2.0.0) bootstrap-sass (= 2.3.2.2) - capybara (= 2.5.0) + capybara (= 2.6.2) carrierwave (= 0.10.0) compass-rails (= 2.0.5) configurate (= 0.3.1) From 246cba947e8a035dc3eef9cf9bf7c7ee78e8128e Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 16:21:55 +0100 Subject: [PATCH 05/35] Bump rspec-rails and related --- Gemfile | 2 +- Gemfile.lock | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Gemfile b/Gemfile index 1b02a1da5..11e3a2c9e 100644 --- a/Gemfile +++ b/Gemfile @@ -275,7 +275,7 @@ end group :development, :test do # RSpec (unit tests, some integration tests) - gem "rspec-rails", "3.3.3" + gem "rspec-rails", "3.4.2" # Cucumber (integration tests) gem "cucumber-rails", "1.4.3", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 6d1509ba8..74a59caea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -631,29 +631,29 @@ GEM roxml (3.1.6) activesupport (>= 2.3.0) nokogiri (>= 1.3.3) - rspec (3.3.0) - rspec-core (~> 3.3.0) - rspec-expectations (~> 3.3.0) - rspec-mocks (~> 3.3.0) - rspec-core (3.3.2) - rspec-support (~> 3.3.0) - rspec-expectations (3.3.1) + rspec (3.4.0) + rspec-core (~> 3.4.0) + rspec-expectations (~> 3.4.0) + rspec-mocks (~> 3.4.0) + rspec-core (3.4.2) + rspec-support (~> 3.4.0) + rspec-expectations (3.4.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) + rspec-support (~> 3.4.0) rspec-instafail (0.4.0) rspec - rspec-mocks (3.3.2) + rspec-mocks (3.4.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) - rspec-rails (3.3.3) + rspec-support (~> 3.4.0) + rspec-rails (3.4.2) actionpack (>= 3.0, < 4.3) activesupport (>= 3.0, < 4.3) railties (>= 3.0, < 4.3) - rspec-core (~> 3.3.0) - rspec-expectations (~> 3.3.0) - rspec-mocks (~> 3.3.0) - rspec-support (~> 3.3.0) - rspec-support (3.3.0) + rspec-core (~> 3.4.0) + rspec-expectations (~> 3.4.0) + rspec-mocks (~> 3.4.0) + rspec-support (~> 3.4.0) + rspec-support (3.4.1) rubocop (0.35.1) astrolabe (~> 1.3) parser (>= 2.2.3.0, < 3.0) @@ -879,7 +879,7 @@ DEPENDENCIES responders (= 2.1.1) roxml (= 3.1.6) rspec-instafail (= 0.4.0) - rspec-rails (= 3.3.3) + rspec-rails (= 3.4.2) rubocop (= 0.35.1) ruby-oembed (= 0.9.0) rubyzip (= 1.1.7) From 16fbe061d7cbd2b793ce9bf2af3e6b5c50910693 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 16:23:45 +0100 Subject: [PATCH 06/35] Bump shoulda-matchers --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 11e3a2c9e..55166fc6b 100644 --- a/Gemfile +++ b/Gemfile @@ -268,7 +268,7 @@ group :test do gem "factory_girl_rails", "4.5.0" gem "timecop", "0.8.0" gem "webmock", "1.22.3", require: false - gem "shoulda-matchers", "3.0.1" + gem "shoulda-matchers", "3.1.1" gem "diaspora_federation-test", "0.0.12" end diff --git a/Gemfile.lock b/Gemfile.lock index 74a59caea..968c3c4ff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -678,7 +678,7 @@ GEM rubyzip (~> 1.0) websocket (~> 1.0) shellany (0.0.1) - shoulda-matchers (3.0.1) + shoulda-matchers (3.1.1) activesupport (>= 4.0.0) sidekiq (3.4.2) celluloid (~> 0.16.0) @@ -885,7 +885,7 @@ DEPENDENCIES rubyzip (= 1.1.7) sass-rails (= 5.0.4) selenium-webdriver (= 2.47.1) - shoulda-matchers (= 3.0.1) + shoulda-matchers (= 3.1.1) sidekiq (= 3.4.2) sidetiq (= 0.6.3) simple_captcha2 (= 0.4.0) From 4a75ad43c8dee35e7c0e4c3a2de53a9e2d6611fe Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 16:25:56 +0100 Subject: [PATCH 07/35] Bump webmock --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 55166fc6b..67035dc7f 100644 --- a/Gemfile +++ b/Gemfile @@ -267,7 +267,7 @@ group :test do gem "factory_girl_rails", "4.5.0" gem "timecop", "0.8.0" - gem "webmock", "1.22.3", require: false + gem "webmock", "1.22.6", require: false gem "shoulda-matchers", "3.1.1" gem "diaspora_federation-test", "0.0.12" diff --git a/Gemfile.lock b/Gemfile.lock index 968c3c4ff..92c905a52 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -764,7 +764,7 @@ GEM valid (1.1.0) warden (1.2.6) rack (>= 1.0) - webmock (1.22.3) + webmock (1.22.6) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -903,7 +903,7 @@ DEPENDENCIES uglifier (= 2.7.2) unicorn (= 5.0.1) uuid (= 2.3.8) - webmock (= 1.22.3) + webmock (= 1.22.6) will_paginate (= 3.1.0) BUNDLED WITH From a11c02fc53e93cd205516da0930c8ecf7d66210d Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 16:27:27 +0100 Subject: [PATCH 08/35] Bump factory_girl_rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 67035dc7f..ee16f6581 100644 --- a/Gemfile +++ b/Gemfile @@ -265,7 +265,7 @@ group :test do # General helpers - gem "factory_girl_rails", "4.5.0" + gem "factory_girl_rails", "4.6.0" gem "timecop", "0.8.0" gem "webmock", "1.22.6", require: false gem "shoulda-matchers", "3.1.1" diff --git a/Gemfile.lock b/Gemfile.lock index 92c905a52..61dbd1a23 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -201,7 +201,7 @@ GEM thor (>= 0.14, < 2.0) factory_girl (4.5.0) activesupport (>= 3.0.0) - factory_girl_rails (4.5.0) + factory_girl_rails (4.6.0) factory_girl (~> 4.5.0) railties (>= 3.0.0) faraday (0.9.2) @@ -802,7 +802,7 @@ DEPENDENCIES entypo-rails (= 2.2.3) eye (= 0.7) facebox-rails (= 0.2.0) - factory_girl_rails (= 4.5.0) + factory_girl_rails (= 4.6.0) faraday (= 0.9.2) faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.10.0) From 954697bc9b5a0e9b421bc0d836c5e774bccb4d52 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 16:36:32 +0100 Subject: [PATCH 09/35] Bump devise --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index ee16f6581..3245ce56f 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ gem "json-schema", "2.5.2" # Authentication -gem "devise", "3.5.5" +gem "devise", "3.5.6" gem "devise_lastseenable", "0.0.6" gem "devise-token_authenticatable", "~> 0.4.0" diff --git a/Gemfile.lock b/Gemfile.lock index 61dbd1a23..c34d9e2c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -137,7 +137,7 @@ GEM railties (>= 3, < 5) cucumber-wire (0.0.1) database_cleaner (1.5.1) - devise (3.5.5) + devise (3.5.6) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) @@ -793,7 +793,7 @@ DEPENDENCIES configurate (= 0.3.1) cucumber-rails (= 1.4.3) database_cleaner (= 1.5.1) - devise (= 3.5.5) + devise (= 3.5.6) devise-token_authenticatable (~> 0.4.0) devise_lastseenable (= 0.0.6) diaspora-vines (~> 0.2.0.develop) From 66b81e4dd3a258cbbd1ab87d585d6c27d4c4a961 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 16:41:40 +0100 Subject: [PATCH 10/35] Bump json-schema --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3245ce56f..b5d8edb58 100644 --- a/Gemfile +++ b/Gemfile @@ -18,7 +18,7 @@ gem "diaspora_federation-rails", "0.0.12" gem "acts_as_api", "0.4.2" gem "json", "1.8.3" -gem "json-schema", "2.5.2" +gem "json-schema", "2.6.0" # Authentication diff --git a/Gemfile.lock b/Gemfile.lock index c34d9e2c0..002e64cbd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -419,7 +419,7 @@ GEM multi_json (>= 1.3) rake json (1.8.3) - json-schema (2.5.2) + json-schema (2.6.0) addressable (~> 2.3.8) jwt (1.5.2) kaminari (0.16.3) @@ -827,7 +827,7 @@ DEPENDENCIES js_image_paths (= 0.0.2) jshintrb (= 0.3.0) json (= 1.8.3) - json-schema (= 2.5.2) + json-schema (= 2.6.0) logging-rails (= 0.5.0) markerb (= 1.1.0) messagebus_ruby_api (= 1.0.3) From d3b5215951efecd7f12655490e1b459700ca4030 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 16:43:33 +0100 Subject: [PATCH 11/35] Bump mini_magick --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index b5d8edb58..a6e7a0553 100644 --- a/Gemfile +++ b/Gemfile @@ -71,7 +71,7 @@ gem "activerecord-import", "0.11.0" gem "carrierwave", "0.10.0" gem "fog", "1.37.0" -gem "mini_magick", "4.3.6" +gem "mini_magick", "4.4.0" gem "remotipart", "1.2.1" # GUID generation diff --git a/Gemfile.lock b/Gemfile.lock index 002e64cbd..92763006e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -448,7 +448,7 @@ GEM messagebus_ruby_api (1.0.3) method_source (0.8.2) mime-types (2.99) - mini_magick (4.3.6) + mini_magick (4.4.0) mini_portile2 (2.0.0) minitest (5.8.4) mobile-fu (1.3.1) @@ -831,7 +831,7 @@ DEPENDENCIES logging-rails (= 0.5.0) markerb (= 1.1.0) messagebus_ruby_api (= 1.0.3) - mini_magick (= 4.3.6) + mini_magick (= 4.4.0) minitest mobile-fu (= 1.3.1) nokogiri (= 1.6.7.2) From 9855385bde9e53a59a2f8dfdd802bfb8d8f0368a Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 16:46:58 +0100 Subject: [PATCH 12/35] Bump rb-fsevent --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a6e7a0553..9adcab5be 100644 --- a/Gemfile +++ b/Gemfile @@ -227,7 +227,7 @@ group :development do gem "guard-rspec", "4.6.4" gem "guard-rubocop", "1.2.0" gem "guard", "2.13.0", require: false - gem "rb-fsevent", "0.9.6", require: false + gem "rb-fsevent", "0.9.7", require: false gem "rb-inotify", "0.9.5", require: false # Linters diff --git a/Gemfile.lock b/Gemfile.lock index 92763006e..e31c035e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -613,7 +613,7 @@ GEM rainbow (2.0.0) raindrops (0.15.0) rake (10.5.0) - rb-fsevent (0.9.6) + rb-fsevent (0.9.7) rb-inotify (0.9.5) ffi (>= 0.5.0) rbvmomi (1.8.2) @@ -872,7 +872,7 @@ DEPENDENCIES rails-i18n (= 4.0.8) rails-timeago (= 2.11.0) rails_admin (= 0.8.1) - rb-fsevent (= 0.9.6) + rb-fsevent (= 0.9.7) rb-inotify (= 0.9.5) redcarpet (= 3.3.4) remotipart (= 1.2.1) From 98949e3afd93a09f804bcaf78290bb2e359bc54b Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 16:48:10 +0100 Subject: [PATCH 13/35] Bump rb-inotify --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 9adcab5be..e21a84a52 100644 --- a/Gemfile +++ b/Gemfile @@ -228,7 +228,7 @@ group :development do gem "guard-rubocop", "1.2.0" gem "guard", "2.13.0", require: false gem "rb-fsevent", "0.9.7", require: false - gem "rb-inotify", "0.9.5", require: false + gem "rb-inotify", "0.9.7", require: false # Linters gem "jshintrb", "0.3.0" diff --git a/Gemfile.lock b/Gemfile.lock index e31c035e2..b8f1e0252 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -614,7 +614,7 @@ GEM raindrops (0.15.0) rake (10.5.0) rb-fsevent (0.9.7) - rb-inotify (0.9.5) + rb-inotify (0.9.7) ffi (>= 0.5.0) rbvmomi (1.8.2) builder @@ -873,7 +873,7 @@ DEPENDENCIES rails-timeago (= 2.11.0) rails_admin (= 0.8.1) rb-fsevent (= 0.9.7) - rb-inotify (= 0.9.5) + rb-inotify (= 0.9.7) redcarpet (= 3.3.4) remotipart (= 1.2.1) responders (= 2.1.1) From ed2564d76d5b5522f309db528f60a94f8d5a1676 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 17:02:39 +0100 Subject: [PATCH 14/35] Bump simplecov --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e21a84a52..7cec68274 100644 --- a/Gemfile +++ b/Gemfile @@ -246,7 +246,7 @@ group :development do gem "pry-byebug" # test coverage - gem "simplecov", "0.11.1", require: false + gem "simplecov", "0.11.2", require: false end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index b8f1e0252..0a70fae07 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -694,7 +694,7 @@ GEM simple_captcha2 (0.4.0) rails (>= 4.1) simple_oauth (0.3.1) - simplecov (0.11.1) + simplecov (0.11.2) docile (~> 1.1.0) json (~> 1.8) simplecov-html (~> 0.10.0) @@ -889,7 +889,7 @@ DEPENDENCIES sidekiq (= 3.4.2) sidetiq (= 0.6.3) simple_captcha2 (= 0.4.0) - simplecov (= 0.11.1) + simplecov (= 0.11.2) sinatra (= 1.4.7) sinon-rails (= 1.15.0) spring (= 1.6.1) From c05ca939b61542308d54673b14109826a87aa84b Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 17:03:53 +0100 Subject: [PATCH 15/35] Bump spring --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 7cec68274..559d1d8fa 100644 --- a/Gemfile +++ b/Gemfile @@ -236,7 +236,7 @@ group :development do # Preloading environment - gem "spring", "1.6.1" + gem "spring", "1.6.3" gem "spring-commands-rspec", "1.0.4" gem "spring-commands-cucumber", "1.0.1" diff --git a/Gemfile.lock b/Gemfile.lock index 0a70fae07..122b14731 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -706,7 +706,7 @@ GEM sinon-rails (1.15.0) railties (>= 3.1) slop (3.6.0) - spring (1.6.1) + spring (1.6.3) spring-commands-cucumber (1.0.1) spring (>= 0.9.1) spring-commands-rspec (1.0.4) @@ -892,7 +892,7 @@ DEPENDENCIES simplecov (= 0.11.2) sinatra (= 1.4.7) sinon-rails (= 1.15.0) - spring (= 1.6.1) + spring (= 1.6.3) spring-commands-cucumber (= 1.0.1) spring-commands-rspec (= 1.0.4) test_after_commit (= 0.4.2) From 86ed0026f3bd5fb14f3d5a41a9845a29ec4a0f9d Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 17:05:09 +0100 Subject: [PATCH 16/35] Bump twitter --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 559d1d8fa..5aa8c4733 100644 --- a/Gemfile +++ b/Gemfile @@ -139,7 +139,7 @@ gem "omniauth", "1.3.1" gem "omniauth-facebook", "3.0.0" gem "omniauth-tumblr", "1.2" gem "omniauth-twitter", "1.2.1" -gem "twitter", "5.15.0" +gem "twitter", "5.16.0" gem "omniauth-wordpress", "0.2.2" # Serializers diff --git a/Gemfile.lock b/Gemfile.lock index 122b14731..46de6ca20 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -170,7 +170,7 @@ GEM factory_girl (~> 4.5, >= 4.5.0) diff-lcs (1.2.5) docile (1.1.5) - domain_name (0.5.25) + domain_name (0.5.20160128) unf (>= 0.0.5, < 1.0.0) eco (1.0.0) coffee-script @@ -376,7 +376,7 @@ GEM hike (1.2.3) hiredis (0.5.2) hitimes (1.2.3) - http (0.9.8) + http (1.0.2) addressable (~> 2.3) http-cookie (~> 1.0) http-form_data (~> 1.0.1) @@ -732,12 +732,12 @@ GEM hitimes tins (1.6.0) trollop (2.1.2) - twitter (5.15.0) + twitter (5.16.0) addressable (~> 2.3) buftok (~> 0.2.0) equalizer (= 0.0.10) faraday (~> 0.9.0) - http (>= 0.4, < 0.10) + http (~> 1.0) http_parser.rb (~> 0.6.0) json (~> 1.8) memoizable (~> 0.4.0) @@ -754,7 +754,7 @@ GEM json (>= 1.8.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.1) + unf_ext (0.0.7.2) unicorn (5.0.1) kgio (~> 2.6) rack @@ -897,7 +897,7 @@ DEPENDENCIES spring-commands-rspec (= 1.0.4) test_after_commit (= 0.4.2) timecop (= 0.8.0) - twitter (= 5.15.0) + twitter (= 5.16.0) twitter-text (= 1.13.0) typhoeus (= 0.8.0) uglifier (= 2.7.2) From 3bfab029d5b0464e6c255f66844ae64496690cc5 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 17:06:11 +0100 Subject: [PATCH 17/35] Bump twitter-text --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 5aa8c4733..1a05248be 100644 --- a/Gemfile +++ b/Gemfile @@ -128,7 +128,7 @@ gem "messagebus_ruby_api", "1.0.3" gem "nokogiri", "1.6.7.2" gem "redcarpet", "3.3.4" -gem "twitter-text", "1.13.0" +gem "twitter-text", "1.13.3" gem "roxml", "3.1.6" gem "ruby-oembed", "0.9.0" gem "open_graph_reader", "0.6.1" diff --git a/Gemfile.lock b/Gemfile.lock index 46de6ca20..f8de90d8c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -743,7 +743,7 @@ GEM memoizable (~> 0.4.0) naught (~> 1.0) simple_oauth (~> 0.3.0) - twitter-text (1.13.0) + twitter-text (1.13.3) unf (~> 0.1.0) typhoeus (0.8.0) ethon (>= 0.8.0) @@ -898,7 +898,7 @@ DEPENDENCIES test_after_commit (= 0.4.2) timecop (= 0.8.0) twitter (= 5.16.0) - twitter-text (= 1.13.0) + twitter-text (= 1.13.3) typhoeus (= 0.8.0) uglifier (= 2.7.2) unicorn (= 5.0.1) From 9cf2a9be495dbea1ac3bd01a15d0f070919ccf0d Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 17:26:03 +0100 Subject: [PATCH 18/35] Bump mysql2 ActiveRecord issues seem to be gone. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 1a05248be..46e299b25 100644 --- a/Gemfile +++ b/Gemfile @@ -62,7 +62,7 @@ gem "autoprefixer-rails", "6.3.1" ENV["DB"] ||= "mysql" -gem "mysql2", "0.3.20" if ENV["DB"] == "all" || ENV["DB"] == "mysql" +gem "mysql2", "0.4.2" if ENV["DB"] == "all" || ENV["DB"] == "mysql" gem "pg", "0.18.4" if ENV["DB"] == "all" || ENV["DB"] == "postgres" gem "activerecord-import", "0.11.0" From 02f5e2919904f80902cd29f50256a3d6c214c297 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 17:32:21 +0100 Subject: [PATCH 19/35] Bump byebug --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f8de90d8c..37b722171 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,7 +70,7 @@ GEM sass (~> 3.2) buftok (0.2.0) builder (3.2.2) - byebug (8.2.1) + byebug (8.2.2) capybara (2.6.2) addressable mime-types (>= 1.16) From da2ed56f598491ac91a13dd24c1bbc3c6314244b Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 17:33:48 +0100 Subject: [PATCH 20/35] Bump childprocess --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 37b722171..27a97c52e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -88,7 +88,7 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - childprocess (0.5.8) + childprocess (0.5.9) ffi (~> 1.0, >= 1.0.11) chunky_png (1.3.5) coderay (1.1.0) From 7c4820cec12384ccc05256ac7d43e796c19a5819 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 17:37:55 +0100 Subject: [PATCH 21/35] Bump hiredis, em-hiredis and eventmachine --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 27a97c52e..8f4ff2ac2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -178,16 +178,16 @@ GEM execjs eco-source (1.1.0.rc.1) ejs (1.1.1) - em-hiredis (0.3.0) + em-hiredis (0.3.1) eventmachine (~> 1.0) - hiredis (~> 0.5.0) + hiredis (~> 0.6.0) entypo-rails (2.2.3) railties (>= 3.1, <= 5) equalizer (0.0.10) erubis (2.7.0) ethon (0.8.0) ffi (>= 1.3.0) - eventmachine (1.0.8) + eventmachine (1.0.9.1) excon (0.45.4) execjs (2.6.0) eye (0.7) @@ -374,7 +374,7 @@ GEM hashdiff (0.2.3) hashie (3.4.3) hike (1.2.3) - hiredis (0.5.2) + hiredis (0.6.1) hitimes (1.2.3) http (1.0.2) addressable (~> 2.3) From 42203b28030d4a51c8c6eb5c39d602aab27ea2ad Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 17:52:56 +0100 Subject: [PATCH 22/35] Bump ethon --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8f4ff2ac2..7aa16b1ab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -185,7 +185,7 @@ GEM railties (>= 3.1, <= 5) equalizer (0.0.10) erubis (2.7.0) - ethon (0.8.0) + ethon (0.8.1) ffi (>= 1.3.0) eventmachine (1.0.9.1) excon (0.45.4) From 1ae9869b20f90a816e5386a1ab010bae35a28fc7 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 17:54:09 +0100 Subject: [PATCH 23/35] Bump fog-aws --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7aa16b1ab..a40a26ce4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -251,7 +251,7 @@ GEM fog-atmos (0.1.0) fog-core fog-xml - fog-aws (0.7.6) + fog-aws (0.8.1) fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) @@ -395,7 +395,7 @@ GEM railties (>= 3.0.0) ice_cube (0.11.1) inflecto (0.0.2) - ipaddress (0.8.0) + ipaddress (0.8.2) jasmine (2.4.0) jasmine-core (~> 2.4) phantomjs From 1e3f2556fc29f139fad600b526c63a7afa00623d Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 17:56:31 +0100 Subject: [PATCH 24/35] Bump fog-radosgw --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a40a26ce4..917645e7d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -288,7 +288,7 @@ GEM fog-core fog-xml nokogiri - fog-radosgw (0.0.4) + fog-radosgw (0.0.5) fog-core (>= 1.21.0) fog-json fog-xml (>= 0.0.1) From dd382945e68583ca65bb9d0e74e3bb7667b7a5d2 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 17:57:37 +0100 Subject: [PATCH 25/35] Bump fog-softlayer --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 917645e7d..c60c47f04 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -302,7 +302,7 @@ GEM fog-serverlove (0.1.2) fog-core fog-json - fog-softlayer (1.0.2) + fog-softlayer (1.0.3) fog-core fog-json fog-storm_on_demand (0.1.1) From 07dfb5dcda97a2a59110073a2ee456ab1c6942ef Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 17:58:33 +0100 Subject: [PATCH 26/35] Bump fog-vsphere --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c60c47f04..4a8d67256 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -317,7 +317,7 @@ GEM fog-voxel (0.1.0) fog-core fog-xml - fog-vsphere (0.4.0) + fog-vsphere (0.6.0) fog-core rbvmomi (~> 1.8) fog-xenserver (0.2.2) From fc0ba168472ff1182a8f7c359726efe0b277c670 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 17:59:22 +0100 Subject: [PATCH 27/35] Bump fog-xenserver --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4a8d67256..9e5b4e921 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -320,7 +320,7 @@ GEM fog-vsphere (0.6.0) fog-core rbvmomi (~> 1.8) - fog-xenserver (0.2.2) + fog-xenserver (0.2.3) fog-core fog-xml fog-xml (0.1.2) From ae257ff1376a8f580d504606c1364c3c88be2324 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 18:03:38 +0100 Subject: [PATCH 28/35] Bump lumberjack --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9e5b4e921..536c42200 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -437,7 +437,7 @@ GEM logging (>= 1.8) loofah (2.0.3) nokogiri (>= 1.5.9) - lumberjack (1.0.9) + lumberjack (1.0.10) macaddr (1.7.1) systemu (~> 2.6.2) mail (2.6.3) From a987614ac7153bb71145ec69e3f7570712afb8d6 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 18:05:58 +0100 Subject: [PATCH 29/35] Bump nenv --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 536c42200..31f4d2ad2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -459,7 +459,7 @@ GEM multi_xml (0.5.5) multipart-post (2.0.0) naught (1.1.0) - nenv (0.2.0) + nenv (0.3.0) nested_form (0.3.2) nio4r (1.2.0) nokogiri (1.6.7.2) From b03a010124a23ba37f4e063e70295094a9e7156a Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 18:09:38 +0100 Subject: [PATCH 30/35] Bump oauth2 --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 31f4d2ad2..487579d65 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -421,7 +421,7 @@ GEM json (1.8.3) json-schema (2.6.0) addressable (~> 2.3.8) - jwt (1.5.2) + jwt (1.5.1) kaminari (0.16.3) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -468,12 +468,12 @@ GEM nenv (~> 0.1) shellany (~> 0.0) oauth (0.4.7) - oauth2 (1.0.0) + oauth2 (1.1.0) faraday (>= 0.8, < 0.10) - jwt (~> 1.0) + jwt (~> 1.0, < 1.5.2) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (~> 1.2) + rack (>= 1.2, < 3) omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) From ad83b16b835b45edb89673f36508ab6af5a8e1b9 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 18:12:56 +0100 Subject: [PATCH 31/35] Bump parser --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 487579d65..f31177383 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -497,8 +497,8 @@ GEM faraday (~> 0.9.0) nokogiri (~> 1.6) orm_adapter (0.5.0) - parser (2.2.3.0) - ast (>= 1.1, < 3.0) + parser (2.3.0.4) + ast (~> 2.2) pg (0.18.4) phantomjs (1.9.8.0) powerpack (0.1.1) From a1d055dad3c11e3d0554a52a8803007d80a8bba7 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 18:13:44 +0100 Subject: [PATCH 32/35] Bump phantomjs --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f31177383..29ca4e16f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -500,7 +500,7 @@ GEM parser (2.3.0.4) ast (~> 2.2) pg (0.18.4) - phantomjs (1.9.8.0) + phantomjs (2.1.1.0) powerpack (0.1.1) pry (0.10.3) coderay (~> 1.1.0) From 685884509e181a492b58ee017bddbfa13bc354d5 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 18:15:40 +0100 Subject: [PATCH 33/35] Bump rainbow --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 29ca4e16f..253c71477 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -610,7 +610,7 @@ GEM activesupport (= 4.2.5.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.0.0) + rainbow (2.1.0) raindrops (0.15.0) rake (10.5.0) rb-fsevent (0.9.7) From b2eeed9ab09e5ae6b11f83ef13c9063eb7acef5a Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 18:17:05 +0100 Subject: [PATCH 34/35] Bump request_store --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 253c71477..456ddb678 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -625,7 +625,7 @@ GEM redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) remotipart (1.2.1) - request_store (1.2.1) + request_store (1.3.0) responders (2.1.1) railties (>= 4.2.0, < 5.1) roxml (3.1.6) From cb706010ffc7816d926d1696c41e2035d86cc875 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 9 Feb 2016 18:18:05 +0100 Subject: [PATCH 35/35] Bump sass --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 456ddb678..09062c3d6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -665,7 +665,7 @@ GEM ruby-progressbar (1.7.5) rubyzip (1.1.7) safe_yaml (1.0.4) - sass (3.4.20) + sass (3.4.21) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1)