Merge pull request #5067 from avalonmediasystem/staging

Release 7.5.1

Author: cjcolvar

.circleci/config.yml

@@ -5,7 +5,7 @@ jobs:
   build:
     docker:
       # Primary container image where all steps run.
-      - image: avalonmediasystem/avalon:7.3.0-dev
+      - image: avalonmediasystem/avalon:develop
         environment:
           - DATABASE_URL=postgresql://postgres@localhost:5432/postgres
           - FEDORA_URL=http://localhost:8080/fcrepo/rest
@@ -55,6 +55,8 @@ jobs:
           name: Clean out existing code
           command: rm -rf .[!.]* *
 
+      - run: git config --global --add safe.directory /home/app/avalon
+
       - samvera/cached_checkout
 
       - run: cp config/controlled_vocabulary.yml.example config/controlled_vocabulary.yml
@@ -138,7 +140,7 @@ jobs:
         default: 4
     docker:
       # Primary container image where all steps run.
-      - image: avalonmediasystem/avalon:7.3.0-dev
+      - image: avalonmediasystem/avalon:develop
 
     working_directory: /home/app/avalon
 

Gemfile

@@ -3,10 +3,12 @@ source 'https://rubygems.org'
 # Core rails
 gem 'bootsnap', require: false
 gem 'listen'
-gem 'rails', '=6.0.5.1'
+gem 'rails', '=6.0.6.1'
 gem 'sprockets', '~>3.7.2'
 #gem 'sprockets-rails', require: 'sprockets/railtie'
 gem 'sqlite3'
+# Force newer version of mail for compatibility with rails 6.0.6.1
+gem 'mail', '> 2.8.0.1'
 
 # Assets
 gem 'bootstrap', '~> 4.0'
@@ -70,7 +72,7 @@ gem 'omniauth-lti', git: "https://github.com/avalonmediasystem/omniauth-lti.git"
 gem "omniauth-saml", "~> 2.0"
 
 # Media Access & Transcoding
-gem 'active_encode', '~> 1.0'
+gem 'active_encode', '~> 1.0', '>= 1.1.2'
 gem 'audio_waveform-ruby', '~> 1.0.7', require: 'audio_waveform'
 gem 'browse-everything', git: "https://github.com/avalonmediasystem/browse-everything.git", branch: 'v1.2-avalon'
 gem 'fastimage'

Gemfile.lock

@@ -74,38 +74,38 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.5.1)
-      actionpack (= 6.0.5.1)
+    actioncable (6.0.6.1)
+      actionpack (= 6.0.6.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    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)
+    actionmailbox (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       mail (>= 2.7.1)
-    actionmailer (6.0.5.1)
-      actionpack (= 6.0.5.1)
-      actionview (= 6.0.5.1)
-      activejob (= 6.0.5.1)
+    actionmailer (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      actionview (= 6.0.6.1)
+      activejob (= 6.0.6.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.5.1)
-      actionview (= 6.0.5.1)
-      activesupport (= 6.0.5.1)
+    actionpack (6.0.6.1)
+      actionview (= 6.0.6.1)
+      activesupport (= 6.0.6.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.1)
-      actionpack (= 6.0.5.1)
-      activerecord (= 6.0.5.1)
-      activestorage (= 6.0.5.1)
-      activesupport (= 6.0.5.1)
+    actiontext (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       nokogiri (>= 1.8.5)
-    actionview (6.0.5.1)
-      activesupport (= 6.0.5.1)
+    actionview (6.0.6.1)
+      activesupport (= 6.0.6.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -132,7 +132,7 @@ GEM
     active_elastic_job (3.2.0)
       aws-sdk-sqs (~> 1)
       rails (>= 5.2.6, < 7.1)
-    active_encode (1.1.1)
+    active_encode (1.1.2)
       addressable (~> 2.8)
       rails
     active_fedora-datastreams (0.4.0)
@@ -142,8 +142,8 @@ GEM
       om (~> 3.1)
       rdf (< 3.2)
       rdf-rdfxml (~> 2.0)
-    activejob (6.0.5.1)
-      activesupport (= 6.0.5.1)
+    activejob (6.0.6.1)
+      activesupport (= 6.0.6.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.1)
-      activesupport (= 6.0.5.1)
-    activerecord (6.0.5.1)
-      activemodel (= 6.0.5.1)
-      activesupport (= 6.0.5.1)
+    activemodel (6.0.6.1)
+      activesupport (= 6.0.6.1)
+    activerecord (6.0.6.1)
+      activemodel (= 6.0.6.1)
+      activesupport (= 6.0.6.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.1)
-      actionpack (= 6.0.5.1)
-      activejob (= 6.0.5.1)
-      activerecord (= 6.0.5.1)
+    activestorage (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
       marcel (~> 1.0)
-    activesupport (6.0.5.1)
+    activesupport (6.0.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -311,7 +311,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     config (4.0.0)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
@@ -320,13 +320,14 @@ GEM
       rexml
     crass (1.0.6)
     daemons (1.4.1)
-    dalli (3.2.1)
+    dalli (3.2.3)
     database_cleaner (2.0.1)
       database_cleaner-active_record (~> 2.0.0)
     database_cleaner-active_record (2.0.1)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
+    date (3.3.3)
     declarative (0.0.20)
     deep_merge (1.2.2)
     deprecation (1.1.0)
@@ -398,7 +399,7 @@ GEM
       mail (~> 2.7)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    erubi (1.11.0)
+    erubi (1.12.0)
     et-orbi (1.2.6)
       tzinfo
     ethon (0.15.0)
@@ -428,7 +429,7 @@ GEM
     fugit (1.5.2)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
-    globalid (1.0.0)
+    globalid (1.1.0)
       activesupport (>= 5.0)
     google-analytics-rails (1.1.0)
     google-apis-core (0.7.0)
@@ -548,11 +549,14 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.19.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
+    mail (2.8.1.rc2)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     marc (1.1.1)
       rexml
       scrub_rb (>= 1.0.1, < 2)
@@ -565,24 +569,33 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
-    minitest (5.16.3)
+    mini_portile2 (2.8.1)
+    minitest (5.17.0)
     msgpack (1.4.5)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.2.3)
     mysql2 (0.5.3)
+    net-imap (0.3.4)
+      date
+      net-protocol
     net-ldap (0.17.0)
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
+    net-smtp (0.3.3)
+      net-protocol
     net-ssh (6.1.0)
     netrc (0.11.0)
     nio4r (2.5.8)
     noid (0.9.0)
     noid-rails (3.0.3)
       actionpack (>= 5.0.0, < 7)
       noid (~> 0.9)
-    nokogiri (1.13.9)
+    nokogiri (1.14.1)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     nom-xml (1.2.0)
@@ -635,8 +648,8 @@ GEM
     puma (5.6.4)
       nio4r (~> 2.0)
     raabro (1.4.0)
-    racc (1.6.0)
-    rack (2.2.4)
+    racc (1.6.2)
+    rack (2.2.6.2)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
     rack-protection (2.2.0)
@@ -645,20 +658,20 @@ GEM
       rack
     rack-test (2.0.2)
       rack (>= 1.3)
-    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)
+    rails (6.0.6.1)
+      actioncable (= 6.0.6.1)
+      actionmailbox (= 6.0.6.1)
+      actionmailer (= 6.0.6.1)
+      actionpack (= 6.0.6.1)
+      actiontext (= 6.0.6.1)
+      actionview (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      activemodel (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       bundler (>= 1.3.0)
-      railties (= 6.0.5.1)
+      railties (= 6.0.6.1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -667,14 +680,14 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
     rails_same_site_cookie (0.1.9)
       rack (>= 1.5)
       user_agent_parser (~> 2.6)
-    railties (6.0.5.1)
-      actionpack (= 6.0.5.1)
-      activesupport (= 6.0.5.1)
+    railties (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -892,14 +905,15 @@ GEM
     thor (1.2.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
+    timeout (0.3.1)
     trailblazer-option (0.1.2)
     twitter-typeahead-rails (0.11.1.pre.corejavascript)
       actionpack (>= 3.1)
       jquery-rails
       railties (>= 3.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.10)
+    tzinfo (1.2.11)
       thread_safe (~> 0.1)
     uber (0.0.15)
     uglifier (4.2.0)
@@ -959,7 +973,7 @@ DEPENDENCIES
   active-fedora (~> 13.2, >= 13.2.5)
   active_annotations (~> 0.4)
   active_elastic_job
-  active_encode (~> 1.0)
+  active_encode (~> 1.0, >= 1.1.2)
   active_fedora-datastreams (~> 0.4)
   activejob-traffic_control
   activejob-uniqueness
@@ -1024,6 +1038,7 @@ DEPENDENCIES
   ldp (~> 1.0.3)
   listen
   lograge
+  mail (> 2.8.0.1)
   marc
   media_element_add_to_playlist!
   mediainfo!
@@ -1041,7 +1056,7 @@ DEPENDENCIES
   pry-rails
   puma (>= 4.3.8)
   rack-cors
-  rails (= 6.0.5.1)
+  rails (= 6.0.6.1)
   rails-controller-testing
   rails_same_site_cookie
   rb-readline

app/assets/javascripts/expand_filename.js

@@ -0,0 +1,15 @@
+function expandFilename(id) {
+  var trunc = document.getElementById("truncated_" + id);
+  var full = document.getElementById("full_" + id);
+  var expand = document.getElementById("expand_" + id);
+
+  if (full.style.display === "none") {
+    full.style.display = "";
+    trunc.style.display = "none";
+    expand.innerHTML = "(Show less)";
+  } else {
+    full.style.display = "none";
+    trunc.style.display = "";
+    expand.innerHTML = "(Expand)"
+  }
+}