From 74af02fa79a1c6f72101c48d53da582afe8d377e Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Tue, 5 Sep 2023 09:52:29 -0500 Subject: [PATCH 1/2] Sidekiq: bump client gem to fix Ruby errors Fixes #530 --- Gemfile | 2 +- Gemfile.lock | 15 ++++++--------- config/routes.rb | 3 +++ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 631c8690b..5a3e600c2 100644 --- a/Gemfile +++ b/Gemfile @@ -87,7 +87,7 @@ gem 'carrierwave', '~> 1.2' gem 'mini_magick', '~> 4.9.4' gem 'statesman', '~> 3.4.1' -gem 'sidekiq', '~> 6.3.0' +gem 'sidekiq', '~> 6.4' gem 'sidekiq-failures', '~> 1.0.0' gem 'down', '~> 4.4' gem 'addressable', '~> 2.5.0' diff --git a/Gemfile.lock b/Gemfile.lock index f904db34d..b70b90c70 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -408,7 +408,7 @@ GEM puma (5.6.5) nio4r (~> 2.0) racc (1.7.1) - rack (2.2.7) + rack (2.2.8) rack-cors (2.0.1) rack (>= 2.0.0) rack-mini-profiler (2.3.4) @@ -449,10 +449,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rchardet (1.8.0) - redis (5.0.6) - redis-client (>= 0.9.0) - redis-client (0.14.1) - connection_pool + redis (4.8.1) regexp_parser (2.8.1) responders (3.1.0) actionpack (>= 5.2) @@ -514,10 +511,10 @@ GEM rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - sidekiq (6.3.1) - connection_pool (>= 2.2.2) + sidekiq (6.5.9) + connection_pool (>= 2.2.5, < 3) rack (~> 2.0) - redis (>= 4.2.0) + redis (>= 4.5.0, < 5) sidekiq-failures (1.0.4) sidekiq (>= 4.0.0) sitemap_generator (6.0.2) @@ -650,7 +647,7 @@ DEPENDENCIES sass-rails (~> 5.0) sd_notify (>= 0.1.0) selenium-webdriver - sidekiq (~> 6.3.0) + sidekiq (~> 6.4) sidekiq-failures (~> 1.0.0) sitemap_generator (~> 6.0.2) solr_wrapper! diff --git a/config/routes.rb b/config/routes.rb index 9d0c5bebd..192794875 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,9 @@ get 'help', :to => redirect('https://sites.google.com/umn.edu/btaa-gdp/help') get 'robots.:format' => 'robots#robots' + # Sidekiq - Uncomment and restart app to view sidekiq dashboard + # mount Sidekiq::Web => "/sidekiq" + # Feedback mount PointlessFeedback::Engine, :at => '/feedback' From 9eb02b25c40d609c00b39c6d8eae9f4d179798c4 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Tue, 5 Sep 2023 09:55:57 -0500 Subject: [PATCH 2/2] README: bump for v4.13.1 release Fix sidekiq task errors --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ac5d3a836..fbe12c072 100644 --- a/README.md +++ b/README.md @@ -29,4 +29,4 @@ Visit the [project wiki](https://github.com/BTAA-Geospatial-Data-Project/geoport #### Release Version -B1G Geoportal Version v4.13.0 / GEOMG v0.16.0 / GeoBlacklight v4.1.0 +B1G Geoportal Version v4.13.1 / GEOMG v0.16.0 / GeoBlacklight v4.1.0