From 91652bac4a63de4b8080d68546a4599cd7ff320d Mon Sep 17 00:00:00 2001 From: Jeremy Friesen Date: Mon, 20 Nov 2023 13:28:40 -0500 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A7=B9=20Updating=20Derivative=20Rode?= =?UTF-8?q?o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Related to: - https://github.com/scientist-softserv/utk-hyku/issues/556 --- Gemfile.lock | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4cb6aee9..71497852 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -134,16 +134,15 @@ GIT GIT remote: https://github.com/scientist-softserv/iiif_print.git - revision: eb320b1c454f0219d9e17fd12fd2b525770123b2 + revision: e42cfd2a6d9b0aac9901084625ee1e1a0a3ccb6d branch: main specs: iiif_print (1.0.0) - blacklight_iiif_search (~> 1.0) - derivative-rodeo (~> 0.4) - dry-monads (~> 1.4.0) - hyrax (>= 2.5, < 4) + blacklight_iiif_search (>= 1.0, < 3.0) + derivative-rodeo (~> 0.5) + hyrax (>= 2.5, < 6) nokogiri (>= 1.13.2) - rails (~> 5.0) + rails (>= 5.0, < 8.0) rdf-vocab (~> 3.0) GIT @@ -420,7 +419,7 @@ GEM declarative-option (0.1.0) deprecation (1.1.0) activesupport - derivative-rodeo (0.4.2) + derivative-rodeo (0.5.2) activesupport (>= 5) aws-sdk-s3 aws-sdk-sqs From e646651901fbaeb7ded2952d4373c065aa38745b Mon Sep 17 00:00:00 2001 From: Jeremy Friesen Date: Mon, 20 Nov 2023 15:05:30 -0500 Subject: [PATCH 2/2] Appeasing rubocop --- app/models/user.rb | 4 ---- lib/tasks/set_parent_thumbnail.rake | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 558ef708..7af0ba60 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -48,10 +48,6 @@ def to_s email end - def is_admin - has_role?(:admin) || has_role?(:admin, Site.instance) - end - def is_superadmin has_role? :superadmin end diff --git a/lib/tasks/set_parent_thumbnail.rake b/lib/tasks/set_parent_thumbnail.rake index f9fb7abe..2b429dc2 100644 --- a/lib/tasks/set_parent_thumbnail.rake +++ b/lib/tasks/set_parent_thumbnail.rake @@ -5,7 +5,7 @@ require 'ruby-progressbar' namespace :hyku do namespace :update do desc 'Make sure all works have a thumbnail' - task :set_parent_thumbnail, [:accounts] => [:environment] do |t, args| + task :set_parent_thumbnail, [:accounts] => [:environment] do |_t, args| accounts = if args[:accounts].present? args[:accounts].split(',').map { |a| Account.find_by(name: a.strip) }.compact else