From 2a22bb01c4d6e8268957d7b8dc217f1b65153bc1 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 27 Jun 2021 23:01:41 +0200 Subject: [PATCH 01/29] Bump rails --- Gemfile | 2 +- Gemfile.lock | 82 ++++++++++++++++++++++++++-------------------------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Gemfile b/Gemfile index a363c4adf..7692cf945 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rails", "5.2.5" +gem "rails", "5.2.6" # Legacy Rails features, remove me! # responders (class level) diff --git a/Gemfile.lock b/Gemfile.lock index 4f8053454..88aa1e4c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,25 +2,25 @@ GEM remote: https://rubygems.org/ remote: https://gems.diasporafoundation.org/ specs: - actioncable (5.2.5) - actionpack (= 5.2.5) + actioncable (5.2.6) + actionpack (= 5.2.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.5) - actionpack (= 5.2.5) - actionview (= 5.2.5) - activejob (= 5.2.5) + actionmailer (5.2.6) + actionpack (= 5.2.6) + actionview (= 5.2.6) + activejob (= 5.2.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.5) - actionview (= 5.2.5) - activesupport (= 5.2.5) + actionpack (5.2.6) + actionview (= 5.2.6) + activesupport (= 5.2.6) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.5) - activesupport (= 5.2.5) + actionview (5.2.6) + activesupport (= 5.2.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -28,22 +28,22 @@ GEM active_model_serializers (0.9.7) activemodel (>= 3.2) concurrent-ruby (~> 1.0) - activejob (5.2.5) - activesupport (= 5.2.5) + activejob (5.2.6) + activesupport (= 5.2.6) globalid (>= 0.3.6) - activemodel (5.2.5) - activesupport (= 5.2.5) - activerecord (5.2.5) - activemodel (= 5.2.5) - activesupport (= 5.2.5) + activemodel (5.2.6) + activesupport (= 5.2.6) + activerecord (5.2.6) + activemodel (= 5.2.6) + activesupport (= 5.2.6) arel (>= 9.0) activerecord-import (1.0.4) activerecord (>= 3.2) - activestorage (5.2.5) - actionpack (= 5.2.5) - activerecord (= 5.2.5) + activestorage (5.2.6) + actionpack (= 5.2.6) + activerecord (= 5.2.6) marcel (~> 1.0.0) - activesupport (5.2.5) + activesupport (5.2.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -136,7 +136,7 @@ GEM compass (~> 1.0.0) sass-rails (< 5.1) sprockets (< 4.0) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.9) configurate (0.5.0) connection_pool (2.2.3) crack (0.4.5) @@ -384,7 +384,7 @@ GEM multi_json (~> 1.14) logging-rails (0.6.0) logging (>= 1.8) - loofah (2.9.1) + loofah (2.10.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) macaddr (1.7.2) @@ -403,7 +403,7 @@ GEM mime-types-data (3.2021.0225) mini_magick (4.10.1) mini_mime (1.1.0) - mini_portile2 (2.5.0) + mini_portile2 (2.5.3) minitest (5.14.4) mobile-fu (1.4.0) rack-mobile-detect @@ -519,18 +519,18 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.5) - actioncable (= 5.2.5) - actionmailer (= 5.2.5) - actionpack (= 5.2.5) - actionview (= 5.2.5) - activejob (= 5.2.5) - activemodel (= 5.2.5) - activerecord (= 5.2.5) - activestorage (= 5.2.5) - activesupport (= 5.2.5) + rails (5.2.6) + actioncable (= 5.2.6) + actionmailer (= 5.2.6) + actionpack (= 5.2.6) + actionview (= 5.2.6) + activejob (= 5.2.6) + activemodel (= 5.2.6) + activerecord (= 5.2.6) + activestorage (= 5.2.6) + activesupport (= 5.2.6) bundler (>= 1.3.0) - railties (= 5.2.5) + railties (= 5.2.6) sprockets-rails (>= 2.0.0) rails-assets-autosize (4.0.2) rails-assets-backbone (1.3.3) @@ -593,9 +593,9 @@ GEM rails-timeago (2.18.0) actionpack (>= 3.1) activesupport (>= 3.1) - railties (5.2.5) - actionpack (= 5.2.5) - activesupport (= 5.2.5) + railties (5.2.6) + actionpack (= 5.2.6) + activesupport (= 5.2.6) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -776,7 +776,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket-driver (0.7.3) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) will_paginate (3.3.0) @@ -865,7 +865,7 @@ DEPENDENCIES rack-piwik (= 0.3.0) rack-rewrite (= 1.5.1) rack-ssl (= 1.4.1) - rails (= 5.2.5) + rails (= 5.2.6) rails-assets-autosize (= 4.0.2)! rails-assets-backbone (= 1.3.3)! rails-assets-blueimp-gallery (= 2.33.0)! From 32e580b3ecc2612235f19fe88f6d0c1f06727f8a Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 27 Jun 2021 23:05:02 +0200 Subject: [PATCH 02/29] Bump bindata --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 88aa1e4c0..8311345e6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,7 +73,7 @@ GEM autoprefixer-rails (10.2.4.0) execjs bcrypt (3.1.16) - bindata (2.4.8) + bindata (2.4.10) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) From 486026a1b633c7d147168420487ff4f2c125fe58 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 27 Jun 2021 23:07:28 +0200 Subject: [PATCH 03/29] Bump nokogiri --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 7692cf945..8c4a29bf0 100644 --- a/Gemfile +++ b/Gemfile @@ -143,7 +143,7 @@ gem "leaflet-rails", "1.6.0" # Parsing -gem "nokogiri", "1.11.3" +gem "nokogiri", "1.11.7" gem "open_graph_reader", "0.7.1" # also update User-Agent in features/support/webmock.rb and open_graph_cache_spec.rb gem "redcarpet", "3.5.1" gem "ruby-oembed", "0.12.0" diff --git a/Gemfile.lock b/Gemfile.lock index 8311345e6..de3786bbf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -415,7 +415,7 @@ GEM mysql2 (0.5.3) naught (1.1.0) nio4r (2.5.7) - nokogiri (1.11.3) + nokogiri (1.11.7) mini_portile2 (~> 2.5.0) racc (~> 1.4) oauth (0.5.6) @@ -845,7 +845,7 @@ DEPENDENCIES minitest mobile-fu (= 1.4.0) mysql2 (= 0.5.3) - nokogiri (= 1.11.3) + nokogiri (= 1.11.7) omniauth (= 1.9.1) omniauth-tumblr (= 1.2) omniauth-twitter (= 1.4.0) From 22f053846477abfb5f9f4f43799fe1b976b8c731 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 27 Jun 2021 23:09:12 +0200 Subject: [PATCH 04/29] Bump gon --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 8c4a29bf0..d91fab883 100644 --- a/Gemfile +++ b/Gemfile @@ -190,7 +190,7 @@ gem "typhoeus", "1.4.0" # Views -gem "gon", "6.3.2" +gem "gon", "6.4.0" gem "hamlit", "2.14.6" gem "mobile-fu", "1.4.0" gem "rails-timeago", "2.18.0" diff --git a/Gemfile.lock b/Gemfile.lock index de3786bbf..be938936b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -292,7 +292,7 @@ GEM terminal-table (~> 1.5, >= 1.5.1) globalid (0.4.2) activesupport (>= 4.2.0) - gon (6.3.2) + gon (6.4.0) actionpack (>= 3.0.20) i18n (>= 0.7) multi_json @@ -822,7 +822,7 @@ DEPENDENCIES fixture_builder (= 0.5.2) fog-aws (= 3.5.2) fuubar (= 2.5.1) - gon (= 6.3.2) + gon (= 6.4.0) haml_lint (= 0.37.0) hamlit (= 2.14.6) handlebars_assets (= 0.23.8) From bd68e8ec837a28ddf7879c31a10020aaa1f7bf9e Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 27 Jun 2021 23:11:53 +0200 Subject: [PATCH 05/29] Bump activerecord-import --- Gemfile | 3 +-- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index d91fab883..46b942242 100644 --- a/Gemfile +++ b/Gemfile @@ -75,8 +75,7 @@ group :postgresql, optional: true do gem "pg", "1.2.3" end - -gem "activerecord-import", "1.0.4" +gem "activerecord-import", "1.1.0" # File uploading diff --git a/Gemfile.lock b/Gemfile.lock index be938936b..7403b3a89 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,7 +37,7 @@ GEM activemodel (= 5.2.6) activesupport (= 5.2.6) arel (>= 9.0) - activerecord-import (1.0.4) + activerecord-import (1.1.0) activerecord (>= 3.2) activestorage (5.2.6) actionpack (= 5.2.6) @@ -789,7 +789,7 @@ PLATFORMS DEPENDENCIES active_model_serializers (= 0.9.7) - activerecord-import (= 1.0.4) + activerecord-import (= 1.1.0) acts-as-taggable-on (= 6.5.0) acts_as_api (= 1.0.1) addressable (= 2.7.0) From 93fae13cabeaa009a57ea4df7cec856898b8a239 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 27 Jun 2021 23:18:54 +0200 Subject: [PATCH 06/29] Bump acts-as-taggable-on --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 46b942242..90a026f65 100644 --- a/Gemfile +++ b/Gemfile @@ -177,7 +177,7 @@ gem "rails-assets-diaspora_jsxc", "0.1.5.develop.7", source: "https://gems.diasp # Tags -gem "acts-as-taggable-on", "6.5.0" +gem "acts-as-taggable-on", "8.1.0" # URIs and HTTP diff --git a/Gemfile.lock b/Gemfile.lock index 7403b3a89..531a1f572 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,8 +48,8 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - acts-as-taggable-on (6.5.0) - activerecord (>= 5.0, < 6.1) + acts-as-taggable-on (8.1.0) + activerecord (>= 5.0, < 6.2) acts_as_api (1.0.1) activemodel (>= 3.0.0) activesupport (>= 3.0.0) @@ -790,7 +790,7 @@ PLATFORMS DEPENDENCIES active_model_serializers (= 0.9.7) activerecord-import (= 1.1.0) - acts-as-taggable-on (= 6.5.0) + acts-as-taggable-on (= 8.1.0) acts_as_api (= 1.0.1) addressable (= 2.7.0) apparition (= 0.6.0) From ca44e91de68b3260894e1d70f6551a2a0dd12441 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 27 Jun 2021 23:24:09 +0200 Subject: [PATCH 07/29] Bump asset_sync --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 90a026f65..9d525181b 100644 --- a/Gemfile +++ b/Gemfile @@ -236,7 +236,7 @@ group :production do # we don"t install these on travis to speed up test runs # Third party asset hosting - gem "asset_sync", "2.11.0", require: false + gem "asset_sync", "2.14.2", require: false end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 531a1f572..d0c72e5d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -61,7 +61,7 @@ GEM capybara (~> 3.13, < 4) websocket-driver (>= 0.6.5) arel (9.0.0) - asset_sync (2.11.0) + asset_sync (2.14.2) activemodel (>= 4.1.0) fog-core mime-types (>= 2.99) @@ -233,7 +233,7 @@ GEM tzinfo ethon (0.12.0) ffi (>= 1.3.0) - excon (0.79.0) + excon (0.82.0) execjs (2.7.0) eye (0.10.0) celluloid (~> 0.17.3) @@ -267,7 +267,7 @@ GEM fog-json (~> 1.1) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (2.2.3) + fog-core (2.2.4) builder excon (~> 0.71) formatador (~> 0.2) @@ -278,7 +278,7 @@ GEM fog-xml (0.1.3) fog-core nokogiri (>= 1.5.11, < 2.0.0) - formatador (0.2.5) + formatador (0.3.0) fugit (1.4.4) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.4) @@ -794,7 +794,7 @@ DEPENDENCIES acts_as_api (= 1.0.1) addressable (= 2.7.0) apparition (= 0.6.0) - asset_sync (= 2.11.0) + asset_sync (= 2.14.2) autoprefixer-rails (= 10.2.4.0) bootstrap-sass (= 3.4.1) bootstrap-switch-rails (= 3.3.3) From 0c4d9bb702419d3aef1fb990f035482ff55d8fb3 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 27 Jun 2021 23:25:16 +0200 Subject: [PATCH 08/29] Bump autoprefixer-rails --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 9d525181b..aeff8fbc2 100644 --- a/Gemfile +++ b/Gemfile @@ -59,7 +59,7 @@ gem "rack-cors", "1.1.1", require: "rack/cors" # CSS -gem "autoprefixer-rails", "10.2.4.0" +gem "autoprefixer-rails", "10.2.5.1" gem "bootstrap-sass", "3.4.1" gem "bootstrap-switch-rails", "3.3.3" # 3.3.4 and 3.3.5 is broken, see https://github.com/Bttstrp/bootstrap-switch/issues/691 gem "compass-rails", "3.1.0" diff --git a/Gemfile.lock b/Gemfile.lock index d0c72e5d5..1ad480a5a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,8 +70,8 @@ GEM attr_encrypted (3.1.0) encryptor (~> 3.0.0) attr_required (1.0.1) - autoprefixer-rails (10.2.4.0) - execjs + autoprefixer-rails (10.2.5.1) + execjs (> 0) bcrypt (3.1.16) bindata (2.4.10) bootstrap-sass (3.4.1) @@ -234,7 +234,7 @@ GEM ethon (0.12.0) ffi (>= 1.3.0) excon (0.82.0) - execjs (2.7.0) + execjs (2.8.1) eye (0.10.0) celluloid (~> 0.17.3) celluloid-io (~> 0.17.0) @@ -795,7 +795,7 @@ DEPENDENCIES addressable (= 2.7.0) apparition (= 0.6.0) asset_sync (= 2.14.2) - autoprefixer-rails (= 10.2.4.0) + autoprefixer-rails (= 10.2.5.1) bootstrap-sass (= 3.4.1) bootstrap-switch-rails (= 3.3.3) capybara (= 3.35.3) From dc3bef6a934e4cb7fc701b4033e0a9ef335c8e33 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 27 Jun 2021 23:38:42 +0200 Subject: [PATCH 09/29] Bump carrierwave --- Gemfile | 2 +- Gemfile.lock | 18 +++++++++++++----- app/uploaders/exported_user.rb | 2 +- app/uploaders/processed_image.rb | 2 +- app/uploaders/unprocessed_image.rb | 2 +- config/initializers/carrierwave.rb | 2 +- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index aeff8fbc2..24588ab7d 100644 --- a/Gemfile +++ b/Gemfile @@ -79,7 +79,7 @@ gem "activerecord-import", "1.1.0" # File uploading -gem "carrierwave", "1.3.2" +gem "carrierwave", "2.2.2" gem "fog-aws", "3.5.2" gem "mini_magick", "4.10.1" diff --git a/Gemfile.lock b/Gemfile.lock index 1ad480a5a..9e4b40448 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -89,10 +89,13 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - carrierwave (1.3.2) - activemodel (>= 4.0.0) - activesupport (>= 4.0.0) - mime-types (>= 1.16) + carrierwave (2.2.2) + activemodel (>= 5.0.0) + activesupport (>= 5.0.0) + addressable (~> 2.6) + image_processing (~> 1.1) + marcel (~> 1.0.0) + mini_mime (>= 0.1.3) ssrf_filter (~> 1.0) celluloid (0.17.4) celluloid-essentials @@ -340,6 +343,9 @@ GEM actionpack (>= 3.0.0) i18n-inflector (~> 2.6) railties (>= 3.0.0) + image_processing (1.12.1) + mini_magick (>= 4.9.5, < 5) + ruby-vips (>= 2.0.17, < 3) ipaddress (0.8.3) jasmine (3.7.0) jasmine-core (~> 3.7.0) @@ -658,6 +664,8 @@ GEM rubocop (>= 0.90.0, < 2.0) ruby-oembed (0.12.0) ruby-progressbar (1.11.0) + ruby-vips (2.1.2) + ffi (~> 1.12) rubyzip (2.3.0) rugged (1.0.1) sass (3.4.25) @@ -799,7 +807,7 @@ DEPENDENCIES bootstrap-sass (= 3.4.1) bootstrap-switch-rails (= 3.3.3) capybara (= 3.35.3) - carrierwave (= 1.3.2) + carrierwave (= 2.2.2) chrome_remote (= 0.3.0) compass-rails (= 3.1.0) configurate (= 0.5.0) diff --git a/app/uploaders/exported_user.rb b/app/uploaders/exported_user.rb index 53201d918..3fc0172e6 100644 --- a/app/uploaders/exported_user.rb +++ b/app/uploaders/exported_user.rb @@ -9,7 +9,7 @@ class ExportedUser < SecureUploader "uploads/users" end - def extension_whitelist + def extension_allowlist %w[gz] end diff --git a/app/uploaders/processed_image.rb b/app/uploaders/processed_image.rb index 9d614f466..79b61b9c7 100644 --- a/app/uploaders/processed_image.rb +++ b/app/uploaders/processed_image.rb @@ -11,7 +11,7 @@ class ProcessedImage < CarrierWave::Uploader::Base "uploads/images" end - def extension_whitelist + def extension_allowlist %w[jpg jpeg png gif] end diff --git a/app/uploaders/unprocessed_image.rb b/app/uploaders/unprocessed_image.rb index b662f3b40..6dad5f602 100644 --- a/app/uploaders/unprocessed_image.rb +++ b/app/uploaders/unprocessed_image.rb @@ -17,7 +17,7 @@ class UnprocessedImage < CarrierWave::Uploader::Base "uploads/images" end - def extension_whitelist + def extension_allowlist %w[jpg jpeg png gif] end diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb index 3b0119590..4a212ad11 100644 --- a/config/initializers/carrierwave.rb +++ b/config/initializers/carrierwave.rb @@ -8,9 +8,9 @@ ENV['SSL_CERT_FILE'] = AppConfig.environment.certificate_authorities.get CarrierWave.configure do |config| if !Rails.env.test? && AppConfig.environment.s3.enable? - config.fog_provider = "fog/aws" require "carrierwave/storage/fog" config.storage = :fog + config.cache_storage = :file config.cache_dir = Rails.root.join('tmp', 'uploads').to_s config.fog_credentials = { provider: 'AWS', From 096297bd869f102a8706f5ac24618db33df1682a Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 27 Jun 2021 23:48:51 +0200 Subject: [PATCH 10/29] Bump devise --- Gemfile | 4 ++-- Gemfile.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 24588ab7d..95dbe8389 100644 --- a/Gemfile +++ b/Gemfile @@ -26,9 +26,9 @@ gem "json-schema", "2.8.1" # Authentication -gem "devise", "4.7.3" -gem "devise-two-factor", "4.0.0" +gem "devise", "4.8.0" gem "devise_lastseenable", "0.0.6" +gem "devise-two-factor", "4.0.0" gem "rqrcode", "1.1.2" # Captcha diff --git a/Gemfile.lock b/Gemfile.lock index 9e4b40448..b71dbb677 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -189,7 +189,7 @@ GEM database_cleaner-active_record (1.8.0) activerecord database_cleaner (~> 1.8.0) - devise (4.7.3) + devise (4.8.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -814,7 +814,7 @@ DEPENDENCIES cucumber-api-steps (= 0.14) cucumber-rails (= 2.3.0) database_cleaner-active_record (= 1.8.0) - devise (= 4.7.3) + devise (= 4.8.0) devise-two-factor (= 4.0.0) devise_lastseenable (= 0.0.6) diaspora-prosody-config (= 0.0.7) From e1061c3d5caf8e9ae8a29fb88910ebace71c7305 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 28 Jun 2021 00:02:11 +0200 Subject: [PATCH 11/29] Bump fog-aws --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 95dbe8389..3f3b41f90 100644 --- a/Gemfile +++ b/Gemfile @@ -80,7 +80,7 @@ gem "activerecord-import", "1.1.0" # File uploading gem "carrierwave", "2.2.2" -gem "fog-aws", "3.5.2" +gem "fog-aws", "3.10.0" gem "mini_magick", "4.10.1" # GUID generation diff --git a/Gemfile.lock b/Gemfile.lock index b71dbb677..fa7dd3040 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -265,7 +265,7 @@ GEM activerecord (>= 2) activesupport (>= 2) hashdiff - fog-aws (3.5.2) + fog-aws (3.10.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -828,7 +828,7 @@ DEPENDENCIES faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.13.1) fixture_builder (= 0.5.2) - fog-aws (= 3.5.2) + fog-aws (= 3.10.0) fuubar (= 2.5.1) gon (= 6.4.0) haml_lint (= 0.37.0) From 8eb2a9ca1268f274abfd9b25583e1499e28d09ee Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 28 Jun 2021 00:03:14 +0200 Subject: [PATCH 12/29] Bump haml_lint --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 3f3b41f90..aad489d74 100644 --- a/Gemfile +++ b/Gemfile @@ -241,7 +241,7 @@ end group :development do # Linters - gem "haml_lint", "0.37.0", require: false + gem "haml_lint", "0.37.1", require: false gem "pronto", "0.11.0", require: false gem "pronto-eslint", "0.11.0", require: false gem "pronto-haml", "0.11.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index fa7dd3040..d3eb8dc8c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -303,7 +303,7 @@ GEM haml (5.2.1) temple (>= 0.8.0) tilt - haml_lint (0.37.0) + haml_lint (0.37.1) haml (>= 4.0, < 5.3) parallel (~> 1.10) rainbow @@ -466,7 +466,7 @@ GEM webfinger (>= 1.0.1) orm_adapter (0.5.0) parallel (1.20.1) - parser (3.0.1.0) + parser (3.0.1.1) ast (~> 2.4.1) pg (1.2.3) phantomjs (2.1.1.0) @@ -656,8 +656,8 @@ GEM rubocop-ast (>= 0.6.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.4.1) - parser (>= 2.7.1.5) + rubocop-ast (1.7.0) + parser (>= 3.0.1.1) rubocop-rails (2.9.1) activesupport (>= 4.2.0) rack (>= 1.1) @@ -831,7 +831,7 @@ DEPENDENCIES fog-aws (= 3.10.0) fuubar (= 2.5.1) gon (= 6.4.0) - haml_lint (= 0.37.0) + haml_lint (= 0.37.1) hamlit (= 2.14.6) handlebars_assets (= 0.23.8) http_accept_language (= 2.1.1) From 414638476e64b5719b53871231c61fd663f483e2 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 28 Jun 2021 00:04:34 +0200 Subject: [PATCH 13/29] Bump hamlit --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index aad489d74..058ee14dd 100644 --- a/Gemfile +++ b/Gemfile @@ -190,7 +190,7 @@ gem "typhoeus", "1.4.0" # Views gem "gon", "6.4.0" -gem "hamlit", "2.14.6" +gem "hamlit", "2.15.0" gem "mobile-fu", "1.4.0" gem "rails-timeago", "2.18.0" gem "will_paginate", "3.3.0" diff --git a/Gemfile.lock b/Gemfile.lock index d3eb8dc8c..b2eacfb19 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -309,7 +309,7 @@ GEM rainbow rubocop (>= 0.50.0) sysexits (~> 1.1) - hamlit (2.14.6) + hamlit (2.15.0) temple (>= 0.8.2) thor tilt @@ -832,7 +832,7 @@ DEPENDENCIES fuubar (= 2.5.1) gon (= 6.4.0) haml_lint (= 0.37.1) - hamlit (= 2.14.6) + hamlit (= 2.15.0) handlebars_assets (= 0.23.8) http_accept_language (= 2.1.1) i18n-inflector-rails (= 1.0.7) From edccab4ab372844d95e18caec646c109a1707e96 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 28 Jun 2021 00:05:25 +0200 Subject: [PATCH 14/29] Bump handlebars_assets --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 058ee14dd..485776112 100644 --- a/Gemfile +++ b/Gemfile @@ -92,7 +92,7 @@ gem "entypo-rails", "3.0.0" # JavaScript -gem "handlebars_assets", "0.23.8" +gem "handlebars_assets", "0.23.9" gem "jquery-rails", "4.4.0" gem "js-routes", "1.4.9" gem "js_image_paths", "0.1.1" diff --git a/Gemfile.lock b/Gemfile.lock index b2eacfb19..8cf88a85b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -313,7 +313,7 @@ GEM temple (>= 0.8.2) thor tilt - handlebars_assets (0.23.8) + handlebars_assets (0.23.9) execjs (~> 2.0) sprockets (>= 2.0.0) tilt (>= 1.2) @@ -833,7 +833,7 @@ DEPENDENCIES gon (= 6.4.0) haml_lint (= 0.37.1) hamlit (= 2.15.0) - handlebars_assets (= 0.23.8) + handlebars_assets (= 0.23.9) http_accept_language (= 2.1.1) i18n-inflector-rails (= 1.0.7) jasmine (= 3.7.0) From c98598b8bccf46580df8c0e0fbe4b5b96cd4cb25 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 28 Jun 2021 00:08:33 +0200 Subject: [PATCH 15/29] Bump js-routes --- Gemfile | 2 +- Gemfile.lock | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 485776112..178fed2d8 100644 --- a/Gemfile +++ b/Gemfile @@ -94,7 +94,7 @@ gem "entypo-rails", "3.0.0" gem "handlebars_assets", "0.23.9" gem "jquery-rails", "4.4.0" -gem "js-routes", "1.4.9" +gem "js-routes", "1.4.14" gem "js_image_paths", "0.1.1" source "https://gems.diasporafoundation.org" do diff --git a/Gemfile.lock b/Gemfile.lock index 8cf88a85b..321dc4c65 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -358,9 +358,8 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - js-routes (1.4.9) + js-routes (1.4.14) railties (>= 4) - sprockets-rails js_image_paths (0.1.1) rails (>= 4.0, < 6.0) sprockets (>= 3.0.0) @@ -839,7 +838,7 @@ DEPENDENCIES jasmine (= 3.7.0) jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.4.0) - js-routes (= 1.4.9) + js-routes (= 1.4.14) js_image_paths (= 0.1.1) json (= 2.3.0) json-schema (= 2.8.1) From 29ea68737da0a0ac032b612c9a5d6ea703889e77 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 28 Jun 2021 00:11:40 +0200 Subject: [PATCH 16/29] Bump leaflet-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 178fed2d8..4ad2ae818 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.6.0" +gem "leaflet-rails", "1.7.0" # Parsing diff --git a/Gemfile.lock b/Gemfile.lock index 321dc4c65..2e6f498a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -378,7 +378,7 @@ GEM jwt (2.2.2) kgio (2.11.3) kostya-sigar (2.0.8) - leaflet-rails (1.6.0) + leaflet-rails (1.7.0) rails (>= 4.2.0) listen (3.5.1) rb-fsevent (~> 0.10, >= 0.10.3) @@ -843,7 +843,7 @@ DEPENDENCIES json (= 2.3.0) json-schema (= 2.8.1) json-schema-rspec (= 0.0.4) - leaflet-rails (= 1.6.0) + leaflet-rails (= 1.7.0) listen (= 3.5.1) logging-rails (= 0.6.0) markdown-it-html5-embed (= 1.0.0) From 72ad6fd23b0a652570722e92ac3507cfe4e8cfe9 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 28 Jun 2021 00:14:11 +0200 Subject: [PATCH 17/29] Bump mini_magick --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 4ad2ae818..6f0dbd3fb 100644 --- a/Gemfile +++ b/Gemfile @@ -81,7 +81,7 @@ gem "activerecord-import", "1.1.0" gem "carrierwave", "2.2.2" gem "fog-aws", "3.10.0" -gem "mini_magick", "4.10.1" +gem "mini_magick", "4.11.0" # GUID generation gem "uuid", "2.3.9" diff --git a/Gemfile.lock b/Gemfile.lock index 2e6f498a0..230f1a5a6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -406,7 +406,7 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2021.0225) - mini_magick (4.10.1) + mini_magick (4.11.0) mini_mime (1.1.0) mini_portile2 (2.5.3) minitest (5.14.4) @@ -848,7 +848,7 @@ DEPENDENCIES logging-rails (= 0.6.0) markdown-it-html5-embed (= 1.0.0) markerb (= 1.1.0) - mini_magick (= 4.10.1) + mini_magick (= 4.11.0) minitest mobile-fu (= 1.4.0) mysql2 (= 0.5.3) From 72b66a27821c1447eb8389c3bc519cfe52af894b Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 28 Jun 2021 00:18:02 +0200 Subject: [PATCH 18/29] Bump openid_connect --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 6f0dbd3fb..21ee7865f 100644 --- a/Gemfile +++ b/Gemfile @@ -165,7 +165,7 @@ gem "omniauth-wordpress", "0.2.2" gem "twitter", "7.0.0" # OpenID Connect -gem "openid_connect", "1.1.8" +gem "openid_connect", "1.2.0" # Serializers diff --git a/Gemfile.lock b/Gemfile.lock index 230f1a5a6..f93aca55d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -453,7 +453,7 @@ GEM open_graph_reader (0.7.1) faraday (>= 0.9.0) nokogiri (~> 1.6) - openid_connect (1.1.8) + openid_connect (1.2.0) activemodel attr_required (>= 1.0.0) json-jwt (>= 1.5.0) @@ -512,7 +512,7 @@ GEM activesupport rack-mobile-detect (0.4.0) rack - rack-oauth2 (1.16.0) + rack-oauth2 (1.17.0) activesupport attr_required httpclient @@ -858,7 +858,7 @@ DEPENDENCIES omniauth-twitter (= 1.4.0) omniauth-wordpress (= 0.2.2) open_graph_reader (= 0.7.1) - openid_connect (= 1.1.8) + openid_connect (= 1.2.0) pg (= 1.2.3) pronto (= 0.11.0) pronto-eslint (= 0.11.0) From 2fd82c92dd5867f8998027e92999c3035ae5b564 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 28 Jun 2021 00:20:52 +0200 Subject: [PATCH 19/29] Bump pry --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f93aca55d..caf11fc18 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -495,12 +495,12 @@ GEM middleware thor thread_safe - pry (0.13.1) + pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) - pry-byebug (3.9.0) + pry-byebug (3.8.0) byebug (~> 11.0) - pry (~> 0.13.0) + pry (~> 0.10) public_suffix (4.0.6) raabro (1.4.0) racc (1.5.2) From 0e81a2da864fedcf22e98d82e5ef73aa5b6712b6 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 28 Jun 2021 00:22:48 +0200 Subject: [PATCH 20/29] Bump rails-controller-testing --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 21ee7865f..6446ece89 100644 --- a/Gemfile +++ b/Gemfile @@ -303,5 +303,5 @@ group :development, :test do gem "sinon-rails", "1.15.0" # For `assigns` in controller specs - gem "rails-controller-testing", "1.0.4" + gem "rails-controller-testing", "1.0.5" end diff --git a/Gemfile.lock b/Gemfile.lock index caf11fc18..01f0b15ff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -583,10 +583,10 @@ GEM rails-assets-markdown-it-sup (1.0.0) rails-assets-underscore (1.9.1) rails-assets-utatti-perfect-scrollbar (1.4.0) - rails-controller-testing (1.0.4) - actionpack (>= 5.0.1.x) - actionview (>= 5.0.1.x) - activesupport (>= 5.0.1.x) + rails-controller-testing (1.0.5) + actionpack (>= 5.0.1.rc1) + actionview (>= 5.0.1.rc1) + activesupport (>= 5.0.1.rc1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -895,7 +895,7 @@ DEPENDENCIES rails-assets-markdown-it-sub (= 1.0.0)! rails-assets-markdown-it-sup (= 1.0.0)! rails-assets-utatti-perfect-scrollbar (= 1.4.0)! - rails-controller-testing (= 1.0.4) + rails-controller-testing (= 1.0.5) rails-i18n (= 5.1.3) rails-timeago (= 2.18.0) redcarpet (= 3.5.1) From e790e01753f5ce9b0a8b9d254ae3a85e6e316a28 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 28 Jun 2021 00:24:36 +0200 Subject: [PATCH 21/29] Bump rails-timeago --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 6446ece89..dd119f98b 100644 --- a/Gemfile +++ b/Gemfile @@ -192,7 +192,7 @@ gem "typhoeus", "1.4.0" gem "gon", "6.4.0" gem "hamlit", "2.15.0" gem "mobile-fu", "1.4.0" -gem "rails-timeago", "2.18.0" +gem "rails-timeago", "2.19.1" gem "will_paginate", "3.3.0" # Logging diff --git a/Gemfile.lock b/Gemfile.lock index 01f0b15ff..aa64b7617 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -595,7 +595,7 @@ GEM rails-i18n (5.1.3) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) - rails-timeago (2.18.0) + rails-timeago (2.19.1) actionpack (>= 3.1) activesupport (>= 3.1) railties (5.2.6) @@ -897,7 +897,7 @@ DEPENDENCIES rails-assets-utatti-perfect-scrollbar (= 1.4.0)! rails-controller-testing (= 1.0.5) rails-i18n (= 5.1.3) - rails-timeago (= 2.18.0) + rails-timeago (= 2.19.1) redcarpet (= 3.5.1) redis (= 4.2.5) responders (= 3.0.1) From 053a93ea0889efadf87e29a6e1f1731ba56823c5 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 28 Jun 2021 00:26:50 +0200 Subject: [PATCH 22/29] Bump redis --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index dd119f98b..087f24a07 100644 --- a/Gemfile +++ b/Gemfile @@ -37,7 +37,7 @@ gem "simple_captcha2", "0.5.0", require: "simple_captcha" # Background processing -gem "redis", "4.2.5" +gem "redis", "4.3.1" gem "sidekiq", "6.2.1" # Scheduled processing diff --git a/Gemfile.lock b/Gemfile.lock index aa64b7617..0ce108c81 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -611,7 +611,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.5.1) - redis (4.2.5) + redis (4.3.1) regexp_parser (2.1.1) request_store (1.5.0) rack (>= 1.4) @@ -899,7 +899,7 @@ DEPENDENCIES rails-i18n (= 5.1.3) rails-timeago (= 2.19.1) redcarpet (= 3.5.1) - redis (= 4.2.5) + redis (= 4.3.1) responders (= 3.0.1) rqrcode (= 1.1.2) rspec-json_expectations (~> 2.1) From b08202f51d0fa88efa938115d9b76804bf357403 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 28 Jun 2021 00:28:39 +0200 Subject: [PATCH 23/29] Bump rqrcode --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 087f24a07..9287ce97d 100644 --- a/Gemfile +++ b/Gemfile @@ -29,7 +29,7 @@ gem "json-schema", "2.8.1" gem "devise", "4.8.0" gem "devise_lastseenable", "0.0.6" gem "devise-two-factor", "4.0.0" -gem "rqrcode", "1.1.2" +gem "rqrcode", "2.0.0" # Captcha diff --git a/Gemfile.lock b/Gemfile.lock index 0ce108c81..60f35134c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -620,10 +620,10 @@ GEM railties (>= 5.0) rexml (3.2.5) rotp (6.2.0) - rqrcode (1.1.2) + rqrcode (2.0.0) chunky_png (~> 1.0) - rqrcode_core (~> 0.1) - rqrcode_core (0.2.0) + rqrcode_core (~> 1.0) + rqrcode_core (1.0.0) rspec (3.10.0) rspec-core (~> 3.10.0) rspec-expectations (~> 3.10.0) @@ -901,7 +901,7 @@ DEPENDENCIES redcarpet (= 3.5.1) redis (= 4.3.1) responders (= 3.0.1) - rqrcode (= 1.1.2) + rqrcode (= 2.0.0) rspec-json_expectations (~> 2.1) rspec-rails (= 5.0.1) rubocop (= 0.93.1) From 2f29bb3035fe8cb0b87d355ac6a11f1c9448dff9 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 28 Jun 2021 00:41:33 +0200 Subject: [PATCH 24/29] Bump ruby-oembed --- Gemfile | 2 +- Gemfile.lock | 4 ++-- .../jasmine_fixtures/aspects_spec.rb | 18 +++++++++++------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 9287ce97d..8758983c8 100644 --- a/Gemfile +++ b/Gemfile @@ -145,7 +145,7 @@ gem "leaflet-rails", "1.7.0" gem "nokogiri", "1.11.7" gem "open_graph_reader", "0.7.1" # also update User-Agent in features/support/webmock.rb and open_graph_cache_spec.rb gem "redcarpet", "3.5.1" -gem "ruby-oembed", "0.12.0" +gem "ruby-oembed", "0.15.0" gem "twitter-text", "1.14.7" # RTL support diff --git a/Gemfile.lock b/Gemfile.lock index 60f35134c..b66625520 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -661,7 +661,7 @@ GEM activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 0.90.0, < 2.0) - ruby-oembed (0.12.0) + ruby-oembed (0.15.0) ruby-progressbar (1.11.0) ruby-vips (2.1.2) ffi (~> 1.12) @@ -906,7 +906,7 @@ DEPENDENCIES rspec-rails (= 5.0.1) rubocop (= 0.93.1) rubocop-rails (= 2.9.1) - ruby-oembed (= 0.12.0) + ruby-oembed (= 0.15.0) rubyzip (= 2.3.0) sass-rails (= 5.0.7) secure_headers (= 6.3.2) diff --git a/spec/controllers/jasmine_fixtures/aspects_spec.rb b/spec/controllers/jasmine_fixtures/aspects_spec.rb index 47e5ec8ca..42d346900 100644 --- a/spec/controllers/jasmine_fixtures/aspects_spec.rb +++ b/spec/controllers/jasmine_fixtures/aspects_spec.rb @@ -86,19 +86,23 @@ describe StreamsController, :type => :controller do save_fixture(html_for("body"), "aspects_index_with_one_followed_tag") end - it "generates a jasmine fixture with a post containing a video", :fixture => true do + it "generates a jasmine fixture with a post containing a video", fixture: true do stub_request( :get, - "https://www.youtube.com/oembed?format=json&frame=1&iframe=1&maxheight=420&maxwidth=420&scheme=https&url=http://www.youtube.com/watch?v=UYrkQL1bX4A" + "https://www.youtube.com/oembed/?format=json&frame=1&iframe=1&maxheight=420&maxwidth=420&scheme=https&url=https://www.youtube.com/watch?v=UYrkQL1bX4A" ).with( - :headers => {'Accept'=>'*/*'} + headers: { + "Accept" => "*/*", + "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", + "User-Agent" => "Mozilla/5.0 (compatible; ruby-oembed/#{OEmbed::VERSION})" + } ).to_return( - :status => 200, - :body => '{ "title": "LazyTown song - Cooking By The Boo" }', - :headers => {} + status: 200, + body: '{ "title": "LazyTown song - Cooking By The Boo" }', + headers: {} ) - alice.post(:status_message, :text => "http://www.youtube.com/watch?v=UYrkQL1bX4A", :to => @alices_aspect_2.id) + alice.post(:status_message, text: "https://www.youtube.com/watch?v=UYrkQL1bX4A", to: @alices_aspect_2.id) get :aspects save_fixture(html_for("body"), "aspects_index_with_video_post") end From da68d363a0fb6d55a0835b9bc6447b09436329d6 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 28 Jun 2021 00:43:42 +0200 Subject: [PATCH 25/29] Bump simplecov --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b66625520..c934616c1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -220,7 +220,7 @@ GEM fabrication (~> 2.16) uuid (~> 2.3, >= 2.3.8) diff-lcs (1.4.4) - docile (1.3.5) + docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) encryptor (3.0.0) @@ -700,7 +700,7 @@ GEM simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) - simplecov_json_formatter (0.1.2) + simplecov_json_formatter (0.1.3) sinon-rails (1.15.0) railties (>= 3.1) sprockets (3.7.2) From 6b48580373469b6e20b9c5025c5f75c85ab65a3b Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 28 Jun 2021 00:45:06 +0200 Subject: [PATCH 26/29] Bump sprockets-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 8758983c8..78739e4a3 100644 --- a/Gemfile +++ b/Gemfile @@ -64,7 +64,7 @@ gem "bootstrap-sass", "3.4.1" gem "bootstrap-switch-rails", "3.3.3" # 3.3.4 and 3.3.5 is broken, see https://github.com/Bttstrp/bootstrap-switch/issues/691 gem "compass-rails", "3.1.0" gem "sass-rails", "5.0.7" -gem "sprockets-rails", "3.2.1" +gem "sprockets-rails", "3.2.2" # Database diff --git a/Gemfile.lock b/Gemfile.lock index c934616c1..4bb6ad525 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -706,7 +706,7 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.1) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -916,7 +916,7 @@ DEPENDENCIES simple_captcha2 (= 0.5.0) simplecov (= 0.21.2) sinon-rails (= 1.15.0) - sprockets-rails (= 3.2.1) + sprockets-rails (= 3.2.2) string-direction (= 1.2.2) timecop (= 0.9.4) toml-rb (= 2.0.1) From 319d5b55d95f3a8454e87f4427d4018fd51c0e0d Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 28 Jun 2021 00:46:38 +0200 Subject: [PATCH 27/29] Bump webmock --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 78739e4a3..23ea1f5f4 100644 --- a/Gemfile +++ b/Gemfile @@ -283,7 +283,7 @@ group :test do gem "factory_girl_rails", "4.9.0" gem "shoulda-matchers", "4.5.1" gem "timecop", "0.9.4" - gem "webmock", "3.12.2", require: false + gem "webmock", "3.13.0", require: false gem "diaspora_federation-test", "0.2.6" end diff --git a/Gemfile.lock b/Gemfile.lock index 4bb6ad525..9512c9622 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -779,7 +779,7 @@ GEM webfinger (1.1.0) activesupport httpclient (>= 2.4) - webmock (3.12.2) + webmock (3.13.0) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -929,7 +929,7 @@ DEPENDENCIES unicorn-worker-killer (= 0.4.5) uuid (= 2.3.9) versionist (= 2.0.1) - webmock (= 3.12.2) + webmock (= 3.13.0) will_paginate (= 3.3.0) BUNDLED WITH From c1093abaef9416938cb3cf9f836ff4dad0ed4775 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 28 Jun 2021 00:50:28 +0200 Subject: [PATCH 28/29] Bump some dependency gems --- Gemfile.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9512c9622..8277ef126 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -141,7 +141,7 @@ GEM sprockets (< 4.0) concurrent-ruby (1.1.9) configurate (0.5.0) - connection_pool (2.2.3) + connection_pool (2.2.5) crack (0.4.5) rexml crass (1.0.6) @@ -234,8 +234,8 @@ GEM rake et-orbi (1.2.4) tzinfo - ethon (0.12.0) - ffi (>= 1.3.0) + ethon (0.14.0) + ffi (>= 1.15.0) excon (0.82.0) execjs (2.8.1) eye (0.10.0) @@ -257,7 +257,7 @@ GEM http-cookie (~> 1.0.0) faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) - ffi (1.15.0) + ffi (1.15.3) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -282,7 +282,7 @@ GEM fog-core nokogiri (>= 1.5.11, < 2.0.0) formatador (0.3.0) - fugit (1.4.4) + fugit (1.5.0) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.4) fuubar (2.5.1) @@ -324,7 +324,7 @@ GEM http-cookie (~> 1.0) http-form_data (~> 2.2) http-parser (~> 1.2.0) - http-cookie (1.0.3) + http-cookie (1.0.4) domain_name (~> 0.5) http-form_data (2.3.0) http-parser (1.2.3) @@ -375,8 +375,8 @@ GEM rspec jsonpath (1.1.0) multi_json - jwt (2.2.2) - kgio (2.11.3) + jwt (2.2.3) + kgio (2.11.4) kostya-sigar (2.0.8) leaflet-rails (1.7.0) rails (>= 4.2.0) @@ -430,7 +430,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - octokit (4.20.0) + octokit (4.21.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) omniauth (1.9.1) @@ -605,7 +605,7 @@ GEM rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - raindrops (0.19.1) + raindrops (0.19.2) rake (12.3.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) From c203c1eb940779e439ed5b9591fb38991ab5497f Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Tue, 29 Jun 2021 00:22:51 +0200 Subject: [PATCH 29/29] Cleanup unused commenting_disabled? and can_comment? closes #8262 --- .../interim_stream_hackiness_helper.rb | 11 ------ app/views/posts/show.mobile.haml | 2 +- lib/stream/aspect.rb | 9 ----- lib/stream/base.rb | 15 -------- lib/stream/public.rb | 4 --- .../interim_stream_hackiness_helper_spec.rb | 35 ------------------- spec/lib/stream/base_spec.rb | 33 ----------------- 7 files changed, 1 insertion(+), 108 deletions(-) diff --git a/app/helpers/interim_stream_hackiness_helper.rb b/app/helpers/interim_stream_hackiness_helper.rb index b2c7056c7..cf5f547f9 100644 --- a/app/helpers/interim_stream_hackiness_helper.rb +++ b/app/helpers/interim_stream_hackiness_helper.rb @@ -1,17 +1,6 @@ # frozen_string_literal: true module InterimStreamHackinessHelper - def commenting_disabled?(post) - return true unless user_signed_in? - if defined?(@commenting_disabled) - @commenting_disabled - elsif defined?(@stream) - !@stream.can_comment?(post) - else - false - end - end - ##### These methods need to go away once we pass publisher object into the partial ###### def publisher_formatted_text if params[:prefill].present? diff --git a/app/views/posts/show.mobile.haml b/app/views/posts/show.mobile.haml index 61d8556e8..186105560 100644 --- a/app/views/posts/show.mobile.haml +++ b/app/views/posts/show.mobile.haml @@ -4,5 +4,5 @@ .stream = render partial: "shared/stream_element", - locals: {post: post, commenting_disabled: commenting_disabled?(post), expanded_info: true} + locals: {post: post, expanded_info: true} diff --git a/lib/stream/aspect.rb b/lib/stream/aspect.rb index af6972775..071854bf0 100644 --- a/lib/stream/aspect.rb +++ b/lib/stream/aspect.rb @@ -80,15 +80,6 @@ class Stream::Aspect < Stream::Base @all_aspects ||= aspects.size == user.aspects.size end - # This is perfomance optimization, as everyone in your aspect stream you have - # a contact. - # - # @param post [Post] - # @return [Boolean] - def can_comment?(post) - true - end - private def aspect_ids diff --git a/lib/stream/base.rb b/lib/stream/base.rb index 30ac2f92c..1e94b6441 100644 --- a/lib/stream/base.rb +++ b/lib/stream/base.rb @@ -17,12 +17,6 @@ class Stream::Base 'change me in lib/base_stream.rb!' end - # @return [Boolean] - def can_comment?(post) - return true if post.author.local? - post_is_from_contact?(post) - end - def post_from_group(post) [] end @@ -105,13 +99,4 @@ class Stream::Base def contacts_in_stream @contacts_in_stream ||= Contact.where(:user_id => user.id, :person_id => people.map(&:id)).load end - - # @param post [Post] - # @return [Boolean] - def post_is_from_contact?(post) - @can_comment_cache ||= {} - @can_comment_cache[post.id] ||= contacts_in_stream.find{|contact| contact.person_id == post.author.id}.present? - @can_comment_cache[post.id] ||= (user.person_id == post.author_id) - @can_comment_cache[post.id] - end end diff --git a/lib/stream/public.rb b/lib/stream/public.rb index de6484b0e..a60fcb9d8 100644 --- a/lib/stream/public.rb +++ b/lib/stream/public.rb @@ -18,10 +18,6 @@ class Stream::Public < Stream::Base @posts ||= Post.all_public end - def can_comment?(post) - post.author.local? - end - # Override base class method def aspects ["public"] diff --git a/spec/helpers/interim_stream_hackiness_helper_spec.rb b/spec/helpers/interim_stream_hackiness_helper_spec.rb index 69bb04509..4230518bf 100644 --- a/spec/helpers/interim_stream_hackiness_helper_spec.rb +++ b/spec/helpers/interim_stream_hackiness_helper_spec.rb @@ -1,41 +1,6 @@ # frozen_string_literal: true describe InterimStreamHackinessHelper, type: :helper do - describe "commenting_disabled?" do - include Devise::Test::ControllerHelpers - - before do - sign_in alice - def user_signed_in? - true - end - end - - it 'returns true if no user is signed in' do - def user_signed_in? - false - end - expect(commenting_disabled?(double)).to eq(true) - end - - it 'returns true if @commenting_disabled is set' do - @commenting_disabled = true - expect(commenting_disabled?(double)).to eq(true) - @commenting_disabled = false - expect(commenting_disabled?(double)).to eq(false) - end - - it 'returns @stream.can_comment? if @stream is set' do - post = double - @stream = double - expect(@stream).to receive(:can_comment?).with(post).and_return(true) - expect(commenting_disabled?(post)).to eq(false) - - expect(@stream).to receive(:can_comment?).with(post).and_return(false) - expect(commenting_disabled?(post)).to eq(true) - end - end - describe "#publisher_formatted_text" do it "returns the prefill text from the stream" do @stream = double(publisher: Publisher.new(alice, prefill: "hello world")) diff --git a/spec/lib/stream/base_spec.rb b/spec/lib/stream/base_spec.rb index 08fa3d89c..9bd8549ac 100644 --- a/spec/lib/stream/base_spec.rb +++ b/spec/lib/stream/base_spec.rb @@ -30,39 +30,6 @@ describe Stream::Base do end end - describe '.can_comment?' do - before do - @person = FactoryGirl.create(:person) - allow(@stream).to receive(:people).and_return([bob.person, eve.person, @person]) - end - - it 'allows me to comment on my local contacts post' do - post = FactoryGirl.create(:status_message, :author => bob.person) - expect(@stream.can_comment?(post)).to be true - end - - it 'allows me to comment on my own post' do - post = FactoryGirl.create(:status_message, :author => alice.person) - expect(@stream.can_comment?(post)).to be true - end - - it 'allows me to comment on any local public post' do - post = FactoryGirl.create(:status_message, :author => eve.person) - expect(@stream.can_comment?(post)).to be true - end - - it 'allows me to comment on a remote contacts post' do - Contact.create!(:user => @stream.user, :person => @person) - post = FactoryGirl.create(:status_message, :author => @person) - expect(@stream.can_comment?(post)).to be true - end - - it 'returns false if person is remote and not a contact' do - post = FactoryGirl.create(:status_message, :author => @person) - expect(@stream.can_comment?(post)).to be false - end - end - describe '#people' do it 'excludes blocked people' do expect(@stream).to receive(:stream_posts).and_return(double.as_null_object)