Merge pull request #558 from scientist-softserv/i556-updating-gemfile

🧹 Updating Derivative Rodeo
scientist-softserv · Nov 22, 2023 · ef0595a · ef0595a
2 parents 10feb2c + e646651
commit ef0595a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git 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

diff --git 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
@@ -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