Merge pull request #4795 from avalonmediasystem/develop

Blacklight/Rails upgrade for Avalon 7.4

Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Core rails
 gem 'bootsnap', require: false
 gem 'listen'
-gem 'rails', '=6.0.5'
+gem 'rails', '=6.0.5.1'
 gem 'sprockets', '~>3.7.2'
 #gem 'sprockets-rails', require: 'sprockets/railtie'
 gem 'sqlite3'

Gemfile.lock

@@ -74,38 +74,38 @@ GIT
 GEM
  remote: https://rubygems.org/
  specs:
- actioncable (6.0.5)
- actionpack (= 6.0.5)
+ actioncable (6.0.5.1)
+ actionpack (= 6.0.5.1)
  nio4r (~> 2.0)
  websocket-driver (>= 0.6.1)
- actionmailbox (6.0.5)
- actionpack (= 6.0.5)
- activejob (= 6.0.5)
- activerecord (= 6.0.5)
- activestorage (= 6.0.5)
- activesupport (= 6.0.5)
+ actionmailbox (6.0.5.1)
+ actionpack (= 6.0.5.1)
+ activejob (= 6.0.5.1)
+ activerecord (= 6.0.5.1)
+ activestorage (= 6.0.5.1)
+ activesupport (= 6.0.5.1)
  mail (>= 2.7.1)
- actionmailer (6.0.5)
- actionpack (= 6.0.5)
- actionview (= 6.0.5)
- activejob (= 6.0.5)
+ actionmailer (6.0.5.1)
+ actionpack (= 6.0.5.1)
+ actionview (= 6.0.5.1)
+ activejob (= 6.0.5.1)
  mail (~> 2.5, >= 2.5.4)
  rails-dom-testing (~> 2.0)
- actionpack (6.0.5)
- actionview (= 6.0.5)
- activesupport (= 6.0.5)
+ actionpack (6.0.5.1)
+ actionview (= 6.0.5.1)
+ activesupport (= 6.0.5.1)
  rack (~> 2.0, >= 2.0.8)
  rack-test (>= 0.6.3)
  rails-dom-testing (~> 2.0)
  rails-html-sanitizer (~> 1.0, >= 1.2.0)
- actiontext (6.0.5)
- actionpack (= 6.0.5)
- activerecord (= 6.0.5)
- activestorage (= 6.0.5)
- activesupport (= 6.0.5)
+ actiontext (6.0.5.1)
+ actionpack (= 6.0.5.1)
+ activerecord (= 6.0.5.1)
+ activestorage (= 6.0.5.1)
+ activesupport (= 6.0.5.1)
  nokogiri (>= 1.8.5)
- actionview (6.0.5)
- activesupport (= 6.0.5)
+ actionview (6.0.5.1)
+ activesupport (= 6.0.5.1)
  builder (~> 3.1)
  erubi (~> 1.4)
  rails-dom-testing (~> 2.0)
@@ -142,8 +142,8 @@ GEM
  om (~> 3.1)
  rdf (< 3.2)
  rdf-rdfxml (~> 2.0)
- activejob (6.0.5)
- activesupport (= 6.0.5)
+ activejob (6.0.5.1)
+ activesupport (= 6.0.5.1)
  globalid (>= 0.3.6)
  activejob-traffic_control (0.1.3)
  activejob (>= 4.2)
@@ -152,23 +152,23 @@ GEM
  activejob-uniqueness (0.2.2)
  activejob (>= 4.2, < 7)
  redlock (>= 1.2, < 2)
- activemodel (6.0.5)
- activesupport (= 6.0.5)
- activerecord (6.0.5)
- activemodel (= 6.0.5)
- activesupport (= 6.0.5)
+ activemodel (6.0.5.1)
+ activesupport (= 6.0.5.1)
+ activerecord (6.0.5.1)
+ activemodel (= 6.0.5.1)
+ activesupport (= 6.0.5.1)
  activerecord-session_store (2.0.0)
  actionpack (>= 5.2.4.1)
  activerecord (>= 5.2.4.1)
  multi_json (~> 1.11, >= 1.11.2)
  rack (>= 2.0.8, < 3)
  railties (>= 5.2.4.1)
- activestorage (6.0.5)
- actionpack (= 6.0.5)
- activejob (= 6.0.5)
- activerecord (= 6.0.5)
+ activestorage (6.0.5.1)
+ actionpack (= 6.0.5.1)
+ activejob (= 6.0.5.1)
+ activerecord (= 6.0.5.1)
  marcel (~> 1.0)
- activesupport (6.0.5)
+ activesupport (6.0.5.1)
  concurrent-ruby (~> 1.0, >= 1.0.2)
  i18n (>= 0.7, < 2)
  minitest (~> 5.1)
@@ -242,9 +242,10 @@ GEM
  rubocop-performance
  rubocop-rails
  rubocop-rspec
- blacklight (7.25.1)
+ blacklight (7.28.0)
  deprecation
  globalid
+ hashdiff
  i18n (>= 1.7.0)
  jbuilder (~> 2.7)
  kaminari (>= 0.15)
@@ -482,7 +483,7 @@ GEM
  hydra-access-controls (= 12.0.1)
  hydra-core (= 12.0.1)
  rails (>= 5.2, < 7)
- i18n (1.10.0)
+ i18n (1.11.0)
  concurrent-ruby (~> 1.0)
  iconv (1.0.8)
  iiif_manifest (0.6.0)
@@ -581,7 +582,7 @@ GEM
  noid-rails (3.0.3)
  actionpack (>= 5.0.0, < 7)
  noid (~> 0.9)
- nokogiri (1.13.6)
+ nokogiri (1.13.7)
  mini_portile2 (~> 2.8.0)
  racc (~> 1.4)
  nom-xml (1.2.0)
@@ -644,20 +645,20 @@ GEM
  rack
  rack-test (2.0.2)
  rack (>= 1.3)
- rails (6.0.5)
- actioncable (= 6.0.5)
- actionmailbox (= 6.0.5)
- actionmailer (= 6.0.5)
- actionpack (= 6.0.5)
- actiontext (= 6.0.5)
- actionview (= 6.0.5)
- activejob (= 6.0.5)
- activemodel (= 6.0.5)
- activerecord (= 6.0.5)
- activestorage (= 6.0.5)
- activesupport (= 6.0.5)
+ rails (6.0.5.1)
+ actioncable (= 6.0.5.1)
+ actionmailbox (= 6.0.5.1)
+ actionmailer (= 6.0.5.1)
+ actionpack (= 6.0.5.1)
+ actiontext (= 6.0.5.1)
+ actionview (= 6.0.5.1)
+ activejob (= 6.0.5.1)
+ activemodel (= 6.0.5.1)
+ activerecord (= 6.0.5.1)
+ activestorage (= 6.0.5.1)
+ activesupport (= 6.0.5.1)
  bundler (>= 1.3.0)
- railties (= 6.0.5)
+ railties (= 6.0.5.1)
  sprockets-rails (>= 2.0.0)
  rails-controller-testing (1.0.5)
  actionpack (>= 5.0.1.rc1)
@@ -671,9 +672,9 @@ GEM
  rails_same_site_cookie (0.1.9)
  rack (>= 1.5)
  user_agent_parser (~> 2.6)
- railties (6.0.5)
- actionpack (= 6.0.5)
- activesupport (= 6.0.5)
+ railties (6.0.5.1)
+ actionpack (= 6.0.5.1)
+ activesupport (= 6.0.5.1)
  method_source
  rake (>= 0.8.7)
  thor (>= 0.20.3, < 2.0)
@@ -908,7 +909,7 @@ GEM
  unicode-display_width (1.8.0)
  unicode-types (1.7.0)
  user_agent_parser (2.9.0)
- view_component (2.53.0)
+ view_component (2.58.0)
  activesupport (>= 5.0.0, < 8.0)
  method_source (~> 1.0)
  warden (1.2.9)
@@ -1039,7 +1040,7 @@ DEPENDENCIES
  pry-rails
  puma (>= 4.3.8)
  rack-cors
- rails (= 6.0.5)
+ rails (= 6.0.5.1)
  rails-controller-testing
  rails_same_site_cookie
  rb-readline