From 4ae373e3a24ae628f3b20166cc66e5e389ee4468 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 00:35:42 +0200 Subject: [PATCH 01/37] Bump rails --- Gemfile | 2 +- Gemfile.lock | 70 ++++++++++++++++++++++++++-------------------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Gemfile b/Gemfile index cd54325d8..3f669ebe1 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rails", "5.1.6.2" +gem "rails", "5.1.7" # Legacy Rails features, remove me! # responders (class level) diff --git a/Gemfile.lock b/Gemfile.lock index 38e879e6d..f9866a895 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,25 +2,25 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - actioncable (5.1.6.2) - actionpack (= 5.1.6.2) + actioncable (5.1.7) + actionpack (= 5.1.7) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.6.2) - actionpack (= 5.1.6.2) - actionview (= 5.1.6.2) - activejob (= 5.1.6.2) + actionmailer (5.1.7) + actionpack (= 5.1.7) + actionview (= 5.1.7) + activejob (= 5.1.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.6.2) - actionview (= 5.1.6.2) - activesupport (= 5.1.6.2) + actionpack (5.1.7) + actionview (= 5.1.7) + activesupport (= 5.1.7) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.6.2) - activesupport (= 5.1.6.2) + actionview (5.1.7) + activesupport (= 5.1.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -28,18 +28,18 @@ GEM active_model_serializers (0.9.7) activemodel (>= 3.2) concurrent-ruby (~> 1.0) - activejob (5.1.6.2) - activesupport (= 5.1.6.2) + activejob (5.1.7) + activesupport (= 5.1.7) globalid (>= 0.3.6) - activemodel (5.1.6.2) - activesupport (= 5.1.6.2) - activerecord (5.1.6.2) - activemodel (= 5.1.6.2) - activesupport (= 5.1.6.2) + activemodel (5.1.7) + activesupport (= 5.1.7) + activerecord (5.1.7) + activemodel (= 5.1.7) + activesupport (= 5.1.7) arel (~> 8.0) activerecord-import (1.0.1) activerecord (>= 3.2) - activesupport (5.1.6.2) + activesupport (5.1.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -490,7 +490,7 @@ GEM psych (3.1.0) public_suffix (3.0.3) raabro (1.1.6) - rack (2.0.6) + rack (2.0.7) rack-cors (1.0.2) rack-google-analytics (1.2.0) actionpack @@ -511,17 +511,17 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.1.6.2) - actioncable (= 5.1.6.2) - actionmailer (= 5.1.6.2) - actionpack (= 5.1.6.2) - actionview (= 5.1.6.2) - activejob (= 5.1.6.2) - activemodel (= 5.1.6.2) - activerecord (= 5.1.6.2) - activesupport (= 5.1.6.2) + rails (5.1.7) + actioncable (= 5.1.7) + actionmailer (= 5.1.7) + actionpack (= 5.1.7) + actionview (= 5.1.7) + activejob (= 5.1.7) + activemodel (= 5.1.7) + activerecord (= 5.1.7) + activesupport (= 5.1.7) bundler (>= 1.3.0) - railties (= 5.1.6.2) + railties (= 5.1.7) sprockets-rails (>= 2.0.0) rails-assets-autosize (4.0.2) rails-assets-backbone (1.3.3) @@ -584,9 +584,9 @@ GEM rails-timeago (2.17.1) actionpack (>= 3.1) activesupport (>= 3.1) - railties (5.1.6.2) - actionpack (= 5.1.6.2) - activesupport (= 5.1.6.2) + railties (5.1.7) + actionpack (= 5.1.7) + activesupport (= 5.1.7) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -769,7 +769,7 @@ GEM hashdiff websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) + websocket-extensions (0.1.4) will_paginate (3.1.7) xpath (3.2.0) nokogiri (~> 1.8) @@ -858,7 +858,7 @@ DEPENDENCIES rack-piwik (= 0.3.0) rack-rewrite (= 1.5.1) rack-ssl (= 1.4.1) - rails (= 5.1.6.2) + rails (= 5.1.7) rails-assets-autosize (= 4.0.2)! rails-assets-backbone (= 1.3.3)! rails-assets-blueimp-gallery (= 2.33.0)! From e7a7f62531aa6796b4b4042d29091bc9645bda08 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 00:39:30 +0200 Subject: [PATCH 02/37] Bump unicorn --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3f669ebe1..f1330f01c 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem "responders", "2.4.1" # Appserver -gem "unicorn", "5.5.0", require: false +gem "unicorn", "5.5.1", require: false gem "unicorn-worker-killer", "0.4.4" # Federation diff --git a/Gemfile.lock b/Gemfile.lock index f9866a895..1929865ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -739,7 +739,7 @@ GEM unf_ext unf_ext (0.0.7.5) unicode-display_width (1.5.0) - unicorn (5.5.0) + unicorn (5.5.1) kgio (~> 2.6) raindrops (~> 0.7) unicorn-worker-killer (0.4.4) @@ -914,7 +914,7 @@ DEPENDENCIES twitter-text (= 1.14.7) typhoeus (= 1.3.1) uglifier (= 4.1.20) - unicorn (= 5.5.0) + unicorn (= 5.5.1) unicorn-worker-killer (= 0.4.4) uuid (= 2.3.9) versionist (= 1.7.0) From b1441356d2c2849d40ea815ea9bf0d623d3bcdd4 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 00:48:36 +0200 Subject: [PATCH 03/37] Bump sidekiq --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index f1330f01c..5f8b0de2f 100644 --- a/Gemfile +++ b/Gemfile @@ -38,7 +38,7 @@ gem "simple_captcha2", "0.4.3", require: "simple_captcha" # Background processing gem "redis", "3.3.5" # Pinned to 3.3.x because of https://github.com/antirez/redis/issues/4272 -gem "sidekiq", "5.2.5" +gem "sidekiq", "5.2.7" # Scheduled processing diff --git a/Gemfile.lock b/Gemfile.lock index 1929865ed..81de66909 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -664,7 +664,7 @@ GEM shellany (0.0.1) shoulda-matchers (4.0.1) activesupport (>= 4.2.0) - sidekiq (5.2.5) + sidekiq (5.2.7) connection_pool (~> 2.2, >= 2.2.2) rack (>= 1.5.0) rack-protection (>= 1.5.0) @@ -898,7 +898,7 @@ DEPENDENCIES sass-rails (= 5.0.7) secure_headers (= 6.1.0) shoulda-matchers (= 4.0.1) - sidekiq (= 5.2.5) + sidekiq (= 5.2.7) sidekiq-cron (= 1.1.0) simple_captcha2 (= 0.4.3) simplecov (= 0.16.1) From 07513e2ec039fd5a75a22a283914f8607cd01966 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 00:52:08 +0200 Subject: [PATCH 04/37] Bump rack-cors --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 5f8b0de2f..b0cc27b8a 100644 --- a/Gemfile +++ b/Gemfile @@ -54,7 +54,7 @@ gem "configurate", "0.3.1" # Cross-origin resource sharing -gem "rack-cors", "1.0.2", require: "rack/cors" +gem "rack-cors", "1.0.3", require: "rack/cors" # CSS diff --git a/Gemfile.lock b/Gemfile.lock index 81de66909..31200591c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -491,7 +491,7 @@ GEM public_suffix (3.0.3) raabro (1.1.6) rack (2.0.7) - rack-cors (1.0.2) + rack-cors (1.0.3) rack-google-analytics (1.2.0) actionpack activesupport @@ -853,7 +853,7 @@ DEPENDENCIES pronto-scss (= 0.9.1) pry pry-byebug - rack-cors (= 1.0.2) + rack-cors (= 1.0.3) rack-google-analytics (= 1.2.0) rack-piwik (= 0.3.0) rack-rewrite (= 1.5.1) From c154c4e2af3f5a2bf1b791b86054071cac4bab74 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 01:10:53 +0200 Subject: [PATCH 05/37] Bump activerecord-import --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index b0cc27b8a..f89c814ae 100644 --- a/Gemfile +++ b/Gemfile @@ -75,7 +75,7 @@ group :postgresql, optional: true do end -gem "activerecord-import", "1.0.1" +gem "activerecord-import", "1.0.2" # File uploading diff --git a/Gemfile.lock b/Gemfile.lock index 31200591c..ecb863da6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,7 +37,7 @@ GEM activemodel (= 5.1.7) activesupport (= 5.1.7) arel (~> 8.0) - activerecord-import (1.0.1) + activerecord-import (1.0.2) activerecord (>= 3.2) activesupport (5.1.7) concurrent-ruby (~> 1.0, >= 1.0.2) @@ -780,7 +780,7 @@ PLATFORMS DEPENDENCIES active_model_serializers (= 0.9.7) - activerecord-import (= 1.0.1) + activerecord-import (= 1.0.2) acts-as-taggable-on (= 6.0.0) acts_as_api (= 1.0.1) addressable (= 2.5.2) From e2ce43c3c7e037617206df294a00b5e546da9fae Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 01:12:26 +0200 Subject: [PATCH 06/37] Bump fog-aws --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index f89c814ae..d6cd789e1 100644 --- a/Gemfile +++ b/Gemfile @@ -80,7 +80,7 @@ gem "activerecord-import", "1.0.2" # File uploading gem "carrierwave", "1.3.1" -gem "fog-aws", "3.4.0" +gem "fog-aws", "3.5.1" gem "mini_magick", "4.9.3" # GUID generation diff --git a/Gemfile.lock b/Gemfile.lock index ecb863da6..302bd367e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -212,7 +212,7 @@ GEM tzinfo ethon (0.12.0) ffi (>= 1.3.0) - excon (0.62.0) + excon (0.64.0) execjs (2.7.0) eye (0.10.0) celluloid (~> 0.17.3) @@ -238,7 +238,7 @@ GEM activerecord (>= 2) activesupport (>= 2) hashdiff - fog-aws (3.4.0) + fog-aws (3.5.1) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -392,7 +392,7 @@ GEM method_source (0.9.2) mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) + mime-types-data (3.2019.0331) mini_magick (4.9.3) mini_mime (1.0.1) mini_portile2 (2.4.0) @@ -810,7 +810,7 @@ DEPENDENCIES faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.12.2) fixture_builder (= 0.5.2.rc3) - fog-aws (= 3.4.0) + fog-aws (= 3.5.1) fuubar (= 2.3.2) gon (= 6.2.1) guard (= 2.15.0) From 8f5c248536b28c139cee0763c0d1e21f2eaa145c Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 01:14:25 +0200 Subject: [PATCH 07/37] Bump handlebars_assets --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d6cd789e1..c6b5b66a8 100644 --- a/Gemfile +++ b/Gemfile @@ -92,7 +92,7 @@ gem "entypo-rails", "3.0.0" # JavaScript -gem "handlebars_assets", "0.23.3" +gem "handlebars_assets", "0.23.4" gem "jquery-rails", "4.3.3" gem "js-routes", "1.4.4" gem "js_image_paths", "0.1.1" diff --git a/Gemfile.lock b/Gemfile.lock index 302bd367e..6ca99b361 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -302,7 +302,7 @@ GEM temple (>= 0.8.0) thor tilt - handlebars_assets (0.23.3) + handlebars_assets (0.23.4) execjs (~> 2.0) sprockets (>= 2.0.0) tilt (>= 1.2) @@ -818,7 +818,7 @@ DEPENDENCIES guard-rubocop (= 1.3.0) haml_lint (= 0.28.0) hamlit (= 2.9.2) - handlebars_assets (= 0.23.3) + handlebars_assets (= 0.23.4) http_accept_language (= 2.1.1) i18n-inflector-rails (= 1.0.7) jasmine (= 3.3.0) From a018abcfe9ffdeca999901908a3ab3a15cc5d106 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 01:16:07 +0200 Subject: [PATCH 08/37] Bump jquery --- Gemfile | 4 ++-- Gemfile.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index c6b5b66a8..27de92bd4 100644 --- a/Gemfile +++ b/Gemfile @@ -93,12 +93,12 @@ gem "entypo-rails", "3.0.0" # JavaScript gem "handlebars_assets", "0.23.4" -gem "jquery-rails", "4.3.3" +gem "jquery-rails", "4.3.5" gem "js-routes", "1.4.4" gem "js_image_paths", "0.1.1" source "https://rails-assets.org" do - gem "rails-assets-jquery", "3.3.1" # Should be kept in sync with jquery-rails + gem "rails-assets-jquery", "3.4.1" # Should be kept in sync with jquery-rails gem "rails-assets-jquery.ui", "1.11.4" gem "rails-assets-highlightjs", "9.12.0" diff --git a/Gemfile.lock b/Gemfile.lock index 6ca99b361..c11347532 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -339,7 +339,7 @@ GEM rake jasmine-core (3.3.0) jasmine-jquery-rails (2.0.3) - jquery-rails (4.3.3) + jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -547,7 +547,7 @@ GEM rails-assets-jasmine (3.3.0) rails-assets-jasmine-ajax (3.4.0) rails-assets-jasmine (~> 3) - rails-assets-jquery (3.3.1) + rails-assets-jquery (3.4.1) rails-assets-jquery-colorbox (1.6.4) rails-assets-jquery (>= 1.3.2) rails-assets-jquery-fullscreen-plugin (0.5.0) @@ -823,7 +823,7 @@ DEPENDENCIES i18n-inflector-rails (= 1.0.7) jasmine (= 3.3.0) jasmine-jquery-rails (= 2.0.3) - jquery-rails (= 4.3.3) + jquery-rails (= 4.3.5) js-routes (= 1.4.4) js_image_paths (= 0.1.1) json (= 2.2.0) @@ -868,7 +868,7 @@ DEPENDENCIES rails-assets-fine-uploader (= 5.13.0)! rails-assets-highlightjs (= 9.12.0)! rails-assets-jasmine-ajax (= 3.4.0)! - rails-assets-jquery (= 3.3.1)! + rails-assets-jquery (= 3.4.1)! rails-assets-jquery-placeholder (= 2.3.1)! rails-assets-jquery-textchange (= 0.2.3)! rails-assets-jquery.are-you-sure (= 1.9.0)! From 325a9122b88eba3d726540b12aa8b0e6f0cf2b00 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 01:17:15 +0200 Subject: [PATCH 09/37] Bump js-routes --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 27de92bd4..90a53cb27 100644 --- a/Gemfile +++ b/Gemfile @@ -94,7 +94,7 @@ gem "entypo-rails", "3.0.0" gem "handlebars_assets", "0.23.4" gem "jquery-rails", "4.3.5" -gem "js-routes", "1.4.4" +gem "js-routes", "1.4.7" gem "js_image_paths", "0.1.1" source "https://rails-assets.org" do diff --git a/Gemfile.lock b/Gemfile.lock index c11347532..e0c5bbd8b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -343,8 +343,8 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - js-routes (1.4.4) - railties (>= 3.2) + js-routes (1.4.7) + railties (>= 4) sprockets-rails js_image_paths (0.1.1) rails (>= 4.0, < 6.0) @@ -824,7 +824,7 @@ DEPENDENCIES jasmine (= 3.3.0) jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.3.5) - js-routes (= 1.4.4) + js-routes (= 1.4.7) js_image_paths (= 0.1.1) json (= 2.2.0) json-schema (= 2.8.1) From 56670865b92dc4d9d6dcae4656029c070af9a4ea Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 01:23:38 +0200 Subject: [PATCH 10/37] Bump leaflet-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 90a53cb27..e7ecaaf43 100644 --- a/Gemfile +++ b/Gemfile @@ -138,7 +138,7 @@ gem "rails-i18n", "5.1.3" gem "markerb", "1.1.0" # Map -gem "leaflet-rails", "1.3.1" +gem "leaflet-rails", "1.5.1" # Parsing diff --git a/Gemfile.lock b/Gemfile.lock index e0c5bbd8b..1ebc03856 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -365,7 +365,7 @@ GEM jwt (2.1.0) kgio (2.11.2) kostya-sigar (2.0.6) - leaflet-rails (1.3.1) + leaflet-rails (1.5.1) rails (>= 4.2.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) @@ -829,7 +829,7 @@ DEPENDENCIES json (= 2.2.0) json-schema (= 2.8.1) json-schema-rspec (= 0.0.4) - leaflet-rails (= 1.3.1) + leaflet-rails (= 1.5.1) logging-rails (= 0.6.0) markdown-it-html5-embed (= 1.0.0) markerb (= 1.1.0) From a6261fdc64b366e27ce371071a9aa9c081270b25 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 01:26:19 +0200 Subject: [PATCH 11/37] Bump nokogiri --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e7ecaaf43..8707f466b 100644 --- a/Gemfile +++ b/Gemfile @@ -142,7 +142,7 @@ gem "leaflet-rails", "1.5.1" # Parsing -gem "nokogiri", "1.10.1" +gem "nokogiri", "1.10.3" gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb gem "redcarpet", "3.4.0" gem "ruby-oembed", "0.12.0" diff --git a/Gemfile.lock b/Gemfile.lock index 1ebc03856..8200b8cbe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -408,7 +408,7 @@ GEM naught (1.1.0) nenv (0.3.0) nio4r (2.3.1) - nokogiri (1.10.1) + nokogiri (1.10.3) mini_portile2 (~> 2.4.0) notiffany (0.1.1) nenv (~> 0.1) @@ -837,7 +837,7 @@ DEPENDENCIES minitest mobile-fu (= 1.4.0) mysql2 (= 0.5.2) - nokogiri (= 1.10.1) + nokogiri (= 1.10.3) omniauth (= 1.9.0) omniauth-tumblr (= 1.2) omniauth-twitter (= 1.4.0) From ee503737cb4870009207914d986ff2c614b917bf Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 01:42:23 +0200 Subject: [PATCH 12/37] Bump secure_headers --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 8707f466b..d6bf43067 100644 --- a/Gemfile +++ b/Gemfile @@ -154,7 +154,7 @@ gem "string-direction", "1.2.1" # Security Headers -gem "secure_headers", "6.1.0" +gem "secure_headers", "6.1.1" # Services diff --git a/Gemfile.lock b/Gemfile.lock index 8200b8cbe..bb6fa7cae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -660,7 +660,7 @@ GEM scss_lint (0.55.0) rake (>= 0.9, < 13) sass (~> 3.4.20) - secure_headers (6.1.0) + secure_headers (6.1.1) shellany (0.0.1) shoulda-matchers (4.0.1) activesupport (>= 4.2.0) @@ -896,7 +896,7 @@ DEPENDENCIES ruby-oembed (= 0.12.0) rubyzip (= 1.2.2) sass-rails (= 5.0.7) - secure_headers (= 6.1.0) + secure_headers (= 6.1.1) shoulda-matchers (= 4.0.1) sidekiq (= 5.2.7) sidekiq-cron (= 1.1.0) From c059550943fd726c82f30e4f833122595b36bc55 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 01:48:30 +0200 Subject: [PATCH 13/37] Bump openid_connect --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index d6bf43067..f2da8d4cb 100644 --- a/Gemfile +++ b/Gemfile @@ -165,7 +165,7 @@ gem "omniauth-wordpress", "0.2.2" gem "twitter", "6.2.0" # OpenID Connect -gem "openid_connect", "1.1.6" +gem "openid_connect", "1.1.8" # Serializers diff --git a/Gemfile.lock b/Gemfile.lock index bb6fa7cae..404d85af6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -350,7 +350,7 @@ GEM rails (>= 4.0, < 6.0) sprockets (>= 3.0.0) json (2.2.0) - json-jwt (1.10.0) + json-jwt (1.10.2) activesupport (>= 4.2) aes_key_wrap bindata @@ -442,7 +442,7 @@ GEM open_graph_reader (0.6.2) faraday (>= 0.9.0) nokogiri (~> 1.6) - openid_connect (1.1.6) + openid_connect (1.1.8) activemodel attr_required (>= 1.0.0) json-jwt (>= 1.5.0) @@ -488,7 +488,7 @@ GEM byebug (~> 11.0) pry (~> 0.10) psych (3.1.0) - public_suffix (3.0.3) + public_suffix (3.1.1) raabro (1.1.6) rack (2.0.7) rack-cors (1.0.3) @@ -497,7 +497,7 @@ GEM activesupport rack-mobile-detect (0.4.0) rack - rack-oauth2 (1.9.3) + rack-oauth2 (1.10.0) activesupport attr_required httpclient @@ -751,7 +751,7 @@ GEM validate_email (0.1.6) activemodel (>= 3.0) mail (>= 2.2.5) - validate_url (1.0.6) + validate_url (1.0.8) activemodel (>= 3.0.0) public_suffix versionist (1.7.0) @@ -843,7 +843,7 @@ DEPENDENCIES omniauth-twitter (= 1.4.0) omniauth-wordpress (= 0.2.2) open_graph_reader (= 0.6.2) - openid_connect (= 1.1.6) + openid_connect (= 1.1.8) pg (= 1.1.4) poltergeist (= 1.18.1) pronto (= 0.9.5) From fa08ebf7bde789b6d8733103886e3d783317786c Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 01:51:56 +0200 Subject: [PATCH 14/37] Bump addressable --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index f2da8d4cb..c0f30d116 100644 --- a/Gemfile +++ b/Gemfile @@ -181,7 +181,7 @@ gem "acts-as-taggable-on", "6.0.0" # URIs and HTTP -gem "addressable", "2.5.2", require: "addressable/uri" +gem "addressable", "2.6.0", require: "addressable/uri" gem "faraday", "0.15.4" gem "faraday_middleware", "0.12.2" gem "faraday-cookie_jar", "0.0.6" diff --git a/Gemfile.lock b/Gemfile.lock index 404d85af6..c4e77131b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,7 +50,7 @@ GEM activemodel (>= 3.0.0) activesupport (>= 3.0.0) rack (>= 1.1.0) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) aes_key_wrap (1.0.1) arel (8.0.0) @@ -403,7 +403,7 @@ GEM multi_json (1.13.1) multi_test (0.1.2) multi_xml (0.6.0) - multipart-post (2.0.0) + multipart-post (2.1.1) mysql2 (0.5.2) naught (1.1.0) nenv (0.3.0) @@ -654,9 +654,9 @@ GEM sassc (2.0.1) ffi (~> 1.9) rake - sawyer (0.8.1) - addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 1.0) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) scss_lint (0.55.0) rake (>= 0.9, < 13) sass (~> 3.4.20) @@ -783,7 +783,7 @@ DEPENDENCIES activerecord-import (= 1.0.2) acts-as-taggable-on (= 6.0.0) acts_as_api (= 1.0.1) - addressable (= 2.5.2) + addressable (= 2.6.0) asset_sync (= 2.7.0) autoprefixer-rails (= 8.6.5) bootstrap-sass (= 3.4.1) From 06c582a672a085c23ad877ee7702b58506843fe0 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 01:54:02 +0200 Subject: [PATCH 15/37] Bump faraday_middleware --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index c0f30d116..3ecaad1d0 100644 --- a/Gemfile +++ b/Gemfile @@ -183,7 +183,7 @@ gem "acts-as-taggable-on", "6.0.0" gem "addressable", "2.6.0", require: "addressable/uri" gem "faraday", "0.15.4" -gem "faraday_middleware", "0.12.2" +gem "faraday_middleware", "0.13.1" gem "faraday-cookie_jar", "0.0.6" gem "typhoeus", "1.3.1" diff --git a/Gemfile.lock b/Gemfile.lock index c4e77131b..9c33bff22 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -231,7 +231,7 @@ GEM faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) - faraday_middleware (0.12.2) + faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) ffi (1.10.0) fixture_builder (0.5.2.rc3) @@ -808,7 +808,7 @@ DEPENDENCIES factory_girl_rails (= 4.8.0) faraday (= 0.15.4) faraday-cookie_jar (= 0.0.6) - faraday_middleware (= 0.12.2) + faraday_middleware (= 0.13.1) fixture_builder (= 0.5.2.rc3) fog-aws (= 3.5.1) fuubar (= 2.3.2) From 3a1428a67258714aeaef3dcfb308e373ff7be1b0 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 01:55:44 +0200 Subject: [PATCH 16/37] Bump hamlit --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3ecaad1d0..2c6586c82 100644 --- a/Gemfile +++ b/Gemfile @@ -190,7 +190,7 @@ gem "typhoeus", "1.3.1" # Views gem "gon", "6.2.1" -gem "hamlit", "2.9.2" +gem "hamlit", "2.9.3" gem "mobile-fu", "1.4.0" gem "rails-timeago", "2.17.1" gem "will_paginate", "3.1.7" diff --git a/Gemfile.lock b/Gemfile.lock index 9c33bff22..0842b1a2d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -298,7 +298,7 @@ GEM rake (>= 10, < 13) rubocop (>= 0.50.0) sysexits (~> 1.1) - hamlit (2.9.2) + hamlit (2.9.3) temple (>= 0.8.0) thor tilt @@ -817,7 +817,7 @@ DEPENDENCIES guard-rspec (= 4.7.3) guard-rubocop (= 1.3.0) haml_lint (= 0.28.0) - hamlit (= 2.9.2) + hamlit (= 2.9.3) handlebars_assets (= 0.23.4) http_accept_language (= 2.1.1) i18n-inflector-rails (= 1.0.7) From d2c4faeb9f31ba27c0be801817adeeb505849dfb Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 01:58:51 +0200 Subject: [PATCH 17/37] Bump versionist --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 2c6586c82..c3eda088a 100644 --- a/Gemfile +++ b/Gemfile @@ -210,7 +210,7 @@ gem "rubyzip", "1.2.2", require: "zip" # https://github.com/discourse/discourse/pull/238 gem "minitest" -gem "versionist", "1.7.0" +gem "versionist", "2.0.0" # Windows and OSX have an execjs compatible runtime built-in, Linux users should # install Node.js or use "therubyracer". diff --git a/Gemfile.lock b/Gemfile.lock index 0842b1a2d..6ddb99c93 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -754,7 +754,7 @@ GEM validate_url (1.0.8) activemodel (>= 3.0.0) public_suffix - versionist (1.7.0) + versionist (2.0.0) activesupport (>= 3) railties (>= 3) yard (~> 0.9.11) @@ -773,7 +773,7 @@ GEM will_paginate (3.1.7) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.18) + yard (0.9.20) PLATFORMS ruby @@ -917,7 +917,7 @@ DEPENDENCIES unicorn (= 5.5.1) unicorn-worker-killer (= 0.4.4) uuid (= 2.3.9) - versionist (= 1.7.0) + versionist (= 2.0.0) webmock (= 3.5.1) will_paginate (= 3.1.7) From 1458d2d57fcfaf760ed60efdacaf05c796d96ac8 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 02:19:37 +0200 Subject: [PATCH 18/37] Bump rubocop --- .rubocop.yml | 5 ++--- Gemfile | 3 ++- Gemfile.lock | 24 +++++++++++++----------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 0647b5e48..28f9edea4 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,3 +1,5 @@ +require: rubocop-rails + AllCops: TargetRubyVersion: 2.3 Exclude: @@ -5,9 +7,6 @@ AllCops: - "db/schema.rb" - "config/locales/cldr/plurals.rb" -Rails: - Enabled: true - # Disable for rails 4 Rails/HttpPositionalArguments: Enabled: false diff --git a/Gemfile b/Gemfile index c3eda088a..9b30b2e8a 100644 --- a/Gemfile +++ b/Gemfile @@ -254,7 +254,8 @@ group :development do gem "pronto-haml", "0.9.0", require: false gem "pronto-rubocop", "0.9.1", require: false gem "pronto-scss", "0.9.1", require: false - gem "rubocop", "0.66.0", require: false + gem "rubocop", "0.72.0", require: false + gem "rubocop-rails", "2.1.0", require: false # Preloading environment diff --git a/Gemfile.lock b/Gemfile.lock index 6ddb99c93..c5c27fa7b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -331,7 +331,7 @@ GEM i18n-inflector (~> 2.6) railties (>= 3.0.0) ipaddress (0.8.3) - jaro_winkler (1.5.2) + jaro_winkler (1.5.3) jasmine (3.3.0) jasmine-core (~> 3.3.0) phantomjs @@ -453,8 +453,8 @@ GEM validate_url webfinger (>= 1.0.1) orm_adapter (0.5.0) - parallel (1.14.0) - parser (2.6.2.0) + parallel (1.17.0) + parser (2.6.3.0) ast (~> 2.4.0) pg (1.1.4) phantomjs (2.1.1.0) @@ -487,7 +487,6 @@ GEM pry-byebug (3.7.0) byebug (~> 11.0) pry (~> 0.10) - psych (3.1.0) public_suffix (3.1.1) raabro (1.1.6) rack (2.0.7) @@ -630,16 +629,18 @@ GEM rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) rspec-support (3.8.0) - rubocop (0.66.0) + rubocop (0.72.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.5, != 2.5.1.1) - psych (>= 3.1.0) + parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.6) + unicode-display_width (>= 1.4.0, < 1.7) + rubocop-rails (2.1.0) + rack (>= 1.1) + rubocop (>= 0.72.0) ruby-oembed (0.12.0) - ruby-progressbar (1.10.0) + ruby-progressbar (1.10.1) ruby_dep (1.5.0) rubyzip (1.2.2) rugged (0.28.1) @@ -738,7 +739,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.5) - unicode-display_width (1.5.0) + unicode-display_width (1.6.0) unicorn (5.5.1) kgio (~> 2.6) raindrops (~> 0.7) @@ -892,7 +893,8 @@ DEPENDENCIES rqrcode (= 0.10.1) rspec-json_expectations (~> 2.1) rspec-rails (= 3.8.2) - rubocop (= 0.66.0) + rubocop (= 0.72.0) + rubocop-rails (= 2.1.0) ruby-oembed (= 0.12.0) rubyzip (= 1.2.2) sass-rails (= 5.0.7) From 556fa42004f6a9db61aff7f875c4ef7749965088 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 02:24:31 +0200 Subject: [PATCH 19/37] Bump fuubar --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 9b30b2e8a..8e579fab9 100644 --- a/Gemfile +++ b/Gemfile @@ -277,7 +277,7 @@ group :test do # RSpec (unit tests, some integration tests) gem "fixture_builder", "0.5.2.rc3" - gem "fuubar", "2.3.2" + gem "fuubar", "2.4.0" gem "json-schema-rspec", "0.0.4" gem "rspec-json_expectations", "~> 2.1" diff --git a/Gemfile.lock b/Gemfile.lock index c5c27fa7b..2e2ddc527 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -258,7 +258,7 @@ GEM fugit (1.1.8) et-orbi (~> 1.1, >= 1.1.7) raabro (~> 1.1) - fuubar (2.3.2) + fuubar (2.4.0) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) get_process_mem (0.2.3) @@ -611,7 +611,7 @@ GEM rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) rspec-mocks (~> 3.8.0) - rspec-core (3.8.0) + rspec-core (3.8.2) rspec-support (~> 3.8.0) rspec-expectations (3.8.2) diff-lcs (>= 1.2.0, < 2.0) @@ -628,7 +628,7 @@ GEM rspec-expectations (~> 3.8.0) rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-support (3.8.2) rubocop (0.72.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -812,7 +812,7 @@ DEPENDENCIES faraday_middleware (= 0.13.1) fixture_builder (= 0.5.2.rc3) fog-aws (= 3.5.1) - fuubar (= 2.3.2) + fuubar (= 2.4.0) gon (= 6.2.1) guard (= 2.15.0) guard-rspec (= 4.7.3) From 800676a90f2b8e86e6df1be1ad1cb4ef808674be Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 02:27:12 +0200 Subject: [PATCH 20/37] Bump rspec-json_expectations --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2e2ddc527..9d93a1864 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -616,7 +616,7 @@ GEM rspec-expectations (3.8.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) - rspec-json_expectations (2.1.0) + rspec-json_expectations (2.2.0) rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) From 26b247bf98c673c77156d21d40c34e22f08d4c92 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 02:34:43 +0200 Subject: [PATCH 21/37] Bump webmock --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 8e579fab9..91c18c44d 100644 --- a/Gemfile +++ b/Gemfile @@ -294,7 +294,7 @@ group :test do gem "factory_girl_rails", "4.8.0" gem "shoulda-matchers", "4.0.1" gem "timecop", "0.9.1" - gem "webmock", "3.5.1", require: false + gem "webmock", "3.6.0", require: false gem "diaspora_federation-test", "0.2.6" diff --git a/Gemfile.lock b/Gemfile.lock index 9d93a1864..e9d748403 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -306,7 +306,7 @@ GEM execjs (~> 2.0) sprockets (>= 2.0.0) tilt (>= 1.2) - hashdiff (0.3.8) + hashdiff (0.4.0) hashie (3.6.0) http (3.3.0) addressable (~> 2.3) @@ -764,10 +764,10 @@ GEM webfinger (1.1.0) activesupport httpclient (>= 2.4) - webmock (3.5.1) + webmock (3.6.0) addressable (>= 2.3.6) crack (>= 0.3.2) - hashdiff + hashdiff (>= 0.4.0, < 2.0.0) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) @@ -920,7 +920,7 @@ DEPENDENCIES unicorn-worker-killer (= 0.4.4) uuid (= 2.3.9) versionist (= 2.0.0) - webmock (= 3.5.1) + webmock (= 3.6.0) will_paginate (= 3.1.7) BUNDLED WITH From 18b0dd0060c6b3b38531c5d1515a8706e3330cf0 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 02:35:29 +0200 Subject: [PATCH 22/37] Bump coveralls --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 91c18c44d..37858d5d9 100644 --- a/Gemfile +++ b/Gemfile @@ -299,7 +299,7 @@ group :test do gem "diaspora_federation-test", "0.2.6" # Coverage - gem "coveralls", "0.8.22", require: false + gem "coveralls", "0.8.23", require: false end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index e9d748403..1e83c0c8d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -130,11 +130,11 @@ GEM concurrent-ruby (1.1.5) configurate (0.3.1) connection_pool (2.2.2) - coveralls (0.8.22) + coveralls (0.8.23) json (>= 1.8, < 3) simplecov (~> 0.16.1) term-ansicolor (~> 1.3) - thor (~> 0.19.4) + thor (>= 0.19.4, < 2.0) tins (~> 1.6) crack (0.4.3) safe_yaml (~> 1.0.0) @@ -196,7 +196,7 @@ GEM fabrication (~> 2.16) uuid (~> 2.3, >= 2.3.8) diff-lcs (1.3) - docile (1.3.1) + docile (1.3.2) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) encryptor (3.0.0) @@ -714,7 +714,7 @@ GEM tilt (2.0.9) timecop (0.9.1) timers (4.3.0) - tins (1.20.2) + tins (1.20.3) to_regexp (0.2.1) turbo_dev_assets (0.0.2) twitter (6.2.0) @@ -793,7 +793,7 @@ DEPENDENCIES carrierwave (= 1.3.1) compass-rails (= 3.1.0) configurate (= 0.3.1) - coveralls (= 0.8.22) + coveralls (= 0.8.23) cucumber-api-steps (= 0.14) cucumber-rails (= 1.6.0) database_cleaner (= 1.7.0) From 51e7958c4b4a423dc39a969eceadce5ec4d76ddd Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 02:38:23 +0200 Subject: [PATCH 23/37] Bump pronto --- Gemfile | 10 +++++----- Gemfile.lock | 45 ++++++++++++++++++++++----------------------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/Gemfile b/Gemfile index 37858d5d9..7cbe17734 100644 --- a/Gemfile +++ b/Gemfile @@ -249,11 +249,11 @@ group :development do # Linters gem "haml_lint", "0.28.0", require: false - gem "pronto", "0.9.5", require: false - gem "pronto-eslint", "0.9.1", require: false - gem "pronto-haml", "0.9.0", require: false - gem "pronto-rubocop", "0.9.1", require: false - gem "pronto-scss", "0.9.1", require: false + gem "pronto", "0.10.0", require: false + gem "pronto-eslint", "0.10.0", require: false + gem "pronto-haml", "0.10.0", require: false + gem "pronto-rubocop", "0.10.0", require: false + gem "pronto-scss", "0.10.0", require: false gem "rubocop", "0.72.0", require: false gem "rubocop-rails", "2.1.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 1e83c0c8d..f18f22ece 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -263,7 +263,7 @@ GEM ruby-progressbar (~> 1.4) get_process_mem (0.2.3) gherkin (5.1.0) - gitlab (4.10.0) + gitlab (4.11.0) httparty (~> 0.14, >= 0.14.0) terminal-table (~> 1.5, >= 1.5.1) globalid (0.4.2) @@ -318,7 +318,7 @@ GEM http-form_data (2.1.1) http_accept_language (2.1.1) http_parser.rb (0.6.0) - httparty (0.16.4) + httparty (0.17.0) mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) @@ -420,7 +420,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - octokit (4.13.0) + octokit (4.14.0) sawyer (~> 0.8.0, >= 0.5.3) omniauth (1.9.0) hashie (>= 3.4.6, < 3.7.0) @@ -462,24 +462,24 @@ GEM capybara (>= 2.1, < 4) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - pronto (0.9.5) + pronto (0.10.0) gitlab (~> 4.0, >= 4.0.0) httparty (>= 0.13.7) octokit (~> 4.7, >= 4.7.0) - rainbow (~> 2.1) + rainbow (>= 2.2, < 4.0) rugged (~> 0.24, >= 0.23.0) - thor (~> 0.19.0) - pronto-eslint (0.9.1) + thor (~> 0.20.0) + pronto-eslint (0.10.0) eslintrb (~> 2.0, >= 2.0.0) - pronto (~> 0.9.0) - pronto-haml (0.9.0) + pronto (~> 0.10.0) + pronto-haml (0.10.0) haml_lint (~> 0.23) - pronto (~> 0.9.0) - pronto-rubocop (0.9.1) - pronto (~> 0.9.0) + pronto (~> 0.10.0) + pronto-rubocop (0.10.0) + pronto (~> 0.10.0) rubocop (~> 0.50, >= 0.49.1) - pronto-scss (0.9.1) - pronto (~> 0.9.0) + pronto-scss (0.10.0) + pronto (~> 0.10.0) scss_lint (~> 0.43, >= 0.43.0) pry (0.12.2) coderay (~> 1.1.0) @@ -589,8 +589,7 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.2.2) - rake + rainbow (3.0.0) raindrops (0.19.0) rake (12.3.2) rb-fsevent (0.10.3) @@ -643,7 +642,7 @@ GEM ruby-progressbar (1.10.1) ruby_dep (1.5.0) rubyzip (1.2.2) - rugged (0.28.1) + rugged (0.28.2) safe_yaml (1.0.5) sass (3.4.25) sass-rails (5.0.7) @@ -709,7 +708,7 @@ GEM tins (~> 1.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - thor (0.19.4) + thor (0.20.3) thread_safe (0.3.6) tilt (2.0.9) timecop (0.9.1) @@ -847,11 +846,11 @@ DEPENDENCIES openid_connect (= 1.1.8) pg (= 1.1.4) poltergeist (= 1.18.1) - pronto (= 0.9.5) - pronto-eslint (= 0.9.1) - pronto-haml (= 0.9.0) - pronto-rubocop (= 0.9.1) - pronto-scss (= 0.9.1) + pronto (= 0.10.0) + pronto-eslint (= 0.10.0) + pronto-haml (= 0.10.0) + pronto-rubocop (= 0.10.0) + pronto-scss (= 0.10.0) pry pry-byebug rack-cors (= 1.0.3) From 435e60c214d911b91a344971015b3669994193b6 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 02:40:12 +0200 Subject: [PATCH 24/37] Bump cucumber-rails --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 7cbe17734..70ec4f098 100644 --- a/Gemfile +++ b/Gemfile @@ -307,7 +307,7 @@ group :development, :test do gem "rspec-rails", "3.8.2" # Cucumber (integration tests) - gem "cucumber-rails", "1.6.0", require: false + gem "cucumber-rails", "1.7.0", require: false # Jasmine (client side application tests (JS)) gem "jasmine", "3.3.0" diff --git a/Gemfile.lock b/Gemfile.lock index f18f22ece..daae27299 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,7 +65,7 @@ GEM attr_required (1.0.1) autoprefixer-rails (8.6.5) execjs - backports (3.12.0) + backports (3.15.0) bcrypt (3.1.12) bindata (2.4.4) bootstrap-sass (3.4.1) @@ -156,12 +156,12 @@ GEM cucumber-tag_expressions (~> 1.1.0) gherkin (~> 5.0) cucumber-expressions (6.0.1) - cucumber-rails (1.6.0) - capybara (>= 1.1.2, < 4) + cucumber-rails (1.7.0) + capybara (>= 2.3.0, < 4) cucumber (>= 3.0.2, < 4) mime-types (>= 1.17, < 4) nokogiri (~> 1.8) - railties (>= 4, < 6) + railties (>= 4.2, < 7) cucumber-tag_expressions (1.1.1) cucumber-wire (0.0.1) database_cleaner (1.7.0) @@ -597,7 +597,7 @@ GEM ffi (~> 1.0) redcarpet (3.4.0) redis (3.3.5) - regexp_parser (1.3.0) + regexp_parser (1.5.1) request_store (1.4.1) rack (>= 1.4) responders (2.4.1) @@ -794,7 +794,7 @@ DEPENDENCIES configurate (= 0.3.1) coveralls (= 0.8.23) cucumber-api-steps (= 0.14) - cucumber-rails (= 1.6.0) + cucumber-rails (= 1.7.0) database_cleaner (= 1.7.0) devise (= 4.6.1) devise-two-factor (= 3.0.3) From 1e2e06426835f2275dd27348006991f7d1773f2a Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 02:47:03 +0200 Subject: [PATCH 25/37] Bump jasmine --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 70ec4f098..0725b3057 100644 --- a/Gemfile +++ b/Gemfile @@ -310,7 +310,7 @@ group :development, :test do gem "cucumber-rails", "1.7.0", require: false # Jasmine (client side application tests (JS)) - gem "jasmine", "3.3.0" + gem "jasmine", "3.4.0" gem "jasmine-jquery-rails", "2.0.3" gem "rails-assets-jasmine-ajax", "3.4.0", source: "https://rails-assets.org" gem "sinon-rails", "1.15.0" diff --git a/Gemfile.lock b/Gemfile.lock index daae27299..e19fa764c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -332,12 +332,12 @@ GEM railties (>= 3.0.0) ipaddress (0.8.3) jaro_winkler (1.5.3) - jasmine (3.3.0) - jasmine-core (~> 3.3.0) + jasmine (3.4.0) + jasmine-core (~> 3.4.0) phantomjs rack (>= 1.2.1) rake - jasmine-core (3.3.0) + jasmine-core (3.4.0) jasmine-jquery-rails (2.0.3) jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) @@ -543,7 +543,7 @@ GEM rails-assets-favico.js (0.3.10) rails-assets-fine-uploader (5.13.0) rails-assets-highlightjs (9.12.0) - rails-assets-jasmine (3.3.0) + rails-assets-jasmine (3.4.0) rails-assets-jasmine-ajax (3.4.0) rails-assets-jasmine (~> 3) rails-assets-jquery (3.4.1) @@ -821,7 +821,7 @@ DEPENDENCIES handlebars_assets (= 0.23.4) http_accept_language (= 2.1.1) i18n-inflector-rails (= 1.0.7) - jasmine (= 3.3.0) + jasmine (= 3.4.0) jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.3.5) js-routes (= 1.4.7) From cde29af5451a835d5a7fe6564b9014335199da19 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 02:48:04 +0200 Subject: [PATCH 26/37] Bump rails-assets-jasmine-ajax --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0725b3057..b5188789a 100644 --- a/Gemfile +++ b/Gemfile @@ -312,7 +312,7 @@ group :development, :test do # Jasmine (client side application tests (JS)) gem "jasmine", "3.4.0" gem "jasmine-jquery-rails", "2.0.3" - gem "rails-assets-jasmine-ajax", "3.4.0", source: "https://rails-assets.org" + gem "rails-assets-jasmine-ajax", "4.0.0", source: "https://rails-assets.org" gem "sinon-rails", "1.15.0" # For `assigns` in controller specs diff --git a/Gemfile.lock b/Gemfile.lock index e19fa764c..f5abd625f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -544,7 +544,7 @@ GEM rails-assets-fine-uploader (5.13.0) rails-assets-highlightjs (9.12.0) rails-assets-jasmine (3.4.0) - rails-assets-jasmine-ajax (3.4.0) + rails-assets-jasmine-ajax (4.0.0) rails-assets-jasmine (~> 3) rails-assets-jquery (3.4.1) rails-assets-jquery-colorbox (1.6.4) @@ -867,7 +867,7 @@ DEPENDENCIES rails-assets-diaspora_jsxc (= 0.1.5.develop.7)! rails-assets-fine-uploader (= 5.13.0)! rails-assets-highlightjs (= 9.12.0)! - rails-assets-jasmine-ajax (= 3.4.0)! + rails-assets-jasmine-ajax (= 4.0.0)! rails-assets-jquery (= 3.4.1)! rails-assets-jquery-placeholder (= 2.3.1)! rails-assets-jquery-textchange (= 0.2.3)! From 2503934a04774b52039f2cc82e64c2a6a86af357 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 02:53:42 +0200 Subject: [PATCH 27/37] Bump fabrication --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f5abd625f..482a4169c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -220,7 +220,7 @@ GEM kostya-sigar (~> 2.0.0) state_machines thor - fabrication (2.20.1) + fabrication (2.20.2) factory_girl (4.8.0) activesupport (>= 3.0.0) factory_girl_rails (4.8.0) From 4b921816eb06bc5c5143e1989af31de5f2af12f2 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 02:54:50 +0200 Subject: [PATCH 28/37] Bump ffi --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 482a4169c..1b308993a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -233,7 +233,7 @@ GEM http-cookie (~> 1.0.0) faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) - ffi (1.10.0) + ffi (1.11.1) fixture_builder (0.5.2.rc3) activerecord (>= 2) activesupport (>= 2) From 5278ae6a9628c3dd9a070d8ce67b8c658e571b3b Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 02:57:25 +0200 Subject: [PATCH 29/37] Bump fugit --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1b308993a..6d28c64df 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -208,7 +208,7 @@ GEM execjs multi_json (>= 1.3) rake - et-orbi (1.1.7) + et-orbi (1.2.1) tzinfo ethon (0.12.0) ffi (>= 1.3.0) @@ -255,8 +255,8 @@ GEM fog-core nokogiri (>= 1.5.11, < 2.0.0) formatador (0.2.5) - fugit (1.1.8) - et-orbi (~> 1.1, >= 1.1.7) + fugit (1.2.2) + et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.1) fuubar (2.4.0) rspec-core (~> 3.0) From b654ca7f82fd3a56a44d0cd163e848c87497bcc7 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 02:59:18 +0200 Subject: [PATCH 30/37] Bump rails-assets-bootstrap --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6d28c64df..1d873dd4a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -526,7 +526,7 @@ GEM rails-assets-backbone (1.3.3) rails-assets-underscore (>= 1.8.3) rails-assets-blueimp-gallery (2.33.0) - rails-assets-bootstrap (3.3.7) + rails-assets-bootstrap (3.4.1) rails-assets-jquery (>= 1.9.1, < 4) rails-assets-bootstrap-markdown (2.10.0) rails-assets-bootstrap (~> 3) From 4b2414c9eb093c86ac874314de3cb0e86fe9c875 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 03:00:42 +0200 Subject: [PATCH 31/37] Bump rspec-expectations and rspec-mocks --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1d873dd4a..72f797cca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -612,11 +612,11 @@ GEM rspec-mocks (~> 3.8.0) rspec-core (3.8.2) rspec-support (~> 3.8.0) - rspec-expectations (3.8.2) + rspec-expectations (3.8.4) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) rspec-json_expectations (2.2.0) - rspec-mocks (3.8.0) + rspec-mocks (3.8.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) rspec-rails (3.8.2) From 6ede2ade7b89aa4d181f10c31fd4d83ea4076159 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 03:01:38 +0200 Subject: [PATCH 32/37] Bump bcrypt --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 72f797cca..e35403b5f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,7 +66,7 @@ GEM autoprefixer-rails (8.6.5) execjs backports (3.15.0) - bcrypt (3.1.12) + bcrypt (3.1.13) bindata (2.4.4) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) From 18d6d39c625d457c2cf1ee605820de4bd3c42c0c Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 03:02:17 +0200 Subject: [PATCH 33/37] Bump jwt --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e35403b5f..abd274995 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -362,7 +362,7 @@ GEM jsonpath (1.0.1) multi_json to_regexp (~> 0.2.1) - jwt (2.1.0) + jwt (2.2.1) kgio (2.11.2) kostya-sigar (2.0.6) leaflet-rails (1.5.1) From 2b8cc070f27271e464734da64c8b522c85b3e7ca Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 03:03:07 +0200 Subject: [PATCH 34/37] Bump jsonpath --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index abd274995..b3e006112 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -359,7 +359,7 @@ GEM json-schema-rspec (0.0.4) json-schema (~> 2.5) rspec - jsonpath (1.0.1) + jsonpath (1.0.4) multi_json to_regexp (~> 0.2.1) jwt (2.2.1) From 68234fc91f783c0a3eb4f9c5e8a81b408a95c3aa Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 03:03:46 +0200 Subject: [PATCH 35/37] Bump macaddr --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b3e006112..e05d0a4d2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -381,8 +381,8 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.13) - macaddr (1.7.1) - systemu (~> 2.6.2) + macaddr (1.7.2) + systemu (~> 2.6.5) mail (2.7.1) mini_mime (>= 0.1.1) markdown-it-html5-embed (1.0.0) From 397dbdbee84182094c71f67ab1082c22a4166ac9 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 3 Jul 2019 03:04:30 +0200 Subject: [PATCH 36/37] Bump unf_ext closes #8042 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e05d0a4d2..67acf8a3f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -737,7 +737,7 @@ GEM execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.5) + unf_ext (0.0.7.6) unicode-display_width (1.6.0) unicorn (5.5.1) kgio (~> 2.6) From df4e79b842fa16b370c8c4b07b82bdd328f3ef7e Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Tue, 2 Jul 2019 02:37:02 +0200 Subject: [PATCH 37/37] Cleanup pending photos which were never posted with cronjob Only delete photos older than a day, so we don't delete photos for posts which were uploaded 10 minutes ago and the author is still writing the post for it. closes #8041 --- Changelog.md | 1 + app/workers/cleanup_pending_photos.rb | 11 ++++++++ config/initializers/sidekiq_scheduled.rb | 5 ++++ spec/workers/cleanup_pending_photos_spec.rb | 31 +++++++++++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 app/workers/cleanup_pending_photos.rb create mode 100644 spec/workers/cleanup_pending_photos_spec.rb diff --git a/Changelog.md b/Changelog.md index ffc4bb5f3..1f18982b5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ ## Bug fixes ## Features +* Add cronjob to cleanup pending photos which were never posted [#8041](https://github.com/diaspora/diaspora/pull/8041) # 0.7.12.0 diff --git a/app/workers/cleanup_pending_photos.rb b/app/workers/cleanup_pending_photos.rb new file mode 100644 index 000000000..e7cabf54b --- /dev/null +++ b/app/workers/cleanup_pending_photos.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +module Workers + class CleanupPendingPhotos < Base + sidekiq_options queue: :low + + def perform + Photo.where(pending: true).where("created_at < ?", 1.day.ago).destroy_all + end + end +end diff --git a/config/initializers/sidekiq_scheduled.rb b/config/initializers/sidekiq_scheduled.rb index ac9140e38..46fc92adb 100644 --- a/config/initializers/sidekiq_scheduled.rb +++ b/config/initializers/sidekiq_scheduled.rb @@ -29,6 +29,11 @@ def default_job_config "class": "Workers::CleanupOldExports" }, + cleanup_pending_photos: { + "cron": "#{random_minute.call} #{random_hour.call} * * *", + "class": "Workers::CleanupPendingPhotos" + }, + queue_users_for_removal: { "cron": "#{random_minute.call} #{random_hour.call} * * *", "class": "Workers::QueueUsersForRemoval" diff --git a/spec/workers/cleanup_pending_photos_spec.rb b/spec/workers/cleanup_pending_photos_spec.rb new file mode 100644 index 000000000..1a92cac96 --- /dev/null +++ b/spec/workers/cleanup_pending_photos_spec.rb @@ -0,0 +1,31 @@ +# frozen_string_literal: true + +describe Workers::CleanupPendingPhotos do + let!(:photo) { FactoryGirl.create(:photo, author: alice.person, pending: true) } + + it "removes pending photos" do + Timecop.travel(25.hours) do + Workers::CleanupPendingPhotos.new.perform + expect(Photo).not_to exist(photo.id) + end + end + + it "does not remove pending photos newer than one day" do + Timecop.travel(1.hour) do + Workers::CleanupPendingPhotos.new.perform + expect(Photo).to exist(photo.id) + end + end + + it "does not remove posted photos" do + StatusMessageCreationService.new(alice).create( + status_message: {text: "Post with photo"}, + public: true, + photos: [photo.id] + ) + Timecop.travel(25.hours) do + Workers::CleanupPendingPhotos.new.perform + expect(Photo).to exist(photo.id) + end + end +end