From ee1e289d860073e817979c5e4ae4b14b9bcd7882 Mon Sep 17 00:00:00 2001 From: Rob Kaufman Date: Mon, 9 May 2022 14:53:06 -0700 Subject: [PATCH] Update Rails Version (#1800) * update rails --- .dockerignore | 1 + .gitignore | 2 ++ Gemfile.lock | 78 +++++++++++++++++++++++++-------------------------- 3 files changed, 42 insertions(+), 39 deletions(-) diff --git a/.dockerignore b/.dockerignore index 239db43575..45c1f98e18 100644 --- a/.dockerignore +++ b/.dockerignore @@ -30,3 +30,4 @@ fcrpo/* pg/* Dockerfile* fits.log +ImageMagick* \ No newline at end of file diff --git a/.gitignore b/.gitignore index 1446ca39e2..83b37be05a 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,5 @@ config/environments/*.local.yml public/uploads .env.* docker-compose.override.yml +*~undo-tree~ +.DS_Store diff --git a/Gemfile.lock b/Gemfile.lock index 43f2db8e4b..42cf7cef2d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,25 +37,25 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.2.6) - actionpack (= 5.2.6) + actioncable (5.2.8) + actionpack (= 5.2.8) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.6) - actionpack (= 5.2.6) - actionview (= 5.2.6) - activejob (= 5.2.6) + actionmailer (5.2.8) + actionpack (= 5.2.8) + actionview (= 5.2.8) + activejob (= 5.2.8) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.6) - actionview (= 5.2.6) - activesupport (= 5.2.6) + actionpack (5.2.8) + actionview (= 5.2.8) + activesupport (= 5.2.8) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.6) - activesupport (= 5.2.6) + actionview (5.2.8) + activesupport (= 5.2.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -79,28 +79,28 @@ GEM active_encode (0.8.2) rails sprockets (< 4) - activejob (5.2.6) - activesupport (= 5.2.6) + activejob (5.2.8) + activesupport (= 5.2.8) globalid (>= 0.3.6) - activemodel (5.2.6) - activesupport (= 5.2.6) + activemodel (5.2.8) + activesupport (= 5.2.8) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (5.2.6) - activemodel (= 5.2.6) - activesupport (= 5.2.6) + activerecord (5.2.8) + activemodel (= 5.2.8) + activesupport (= 5.2.8) arel (>= 9.0) activerecord-import (1.3.0) activerecord (>= 4.2) activerecord-nulldb-adapter (0.8.0) activerecord (>= 5.2.0, < 7.1) - activestorage (5.2.6) - actionpack (= 5.2.6) - activerecord (= 5.2.6) + activestorage (5.2.8) + actionpack (= 5.2.8) + activerecord (= 5.2.8) marcel (~> 1.0.0) - activesupport (5.2.6) + activesupport (5.2.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -260,7 +260,7 @@ GEM execjs coffee-script-source (1.12.2) colorize (0.8.1) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) connection_pool (2.2.5) crack (0.4.5) rexml @@ -544,7 +544,7 @@ GEM bolognese (~> 1.8, >= 1.8.6) hyrax (~> 2.9) rails (~> 5.2.4, >= 5.2.4.3) - i18n (1.8.11) + i18n (1.10.0) concurrent-ruby (~> 1.0) i18n-debug (1.2.0) i18n (< 2) @@ -675,7 +675,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.13.0) + loofah (2.17.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -779,18 +779,18 @@ GEM rack (2.2.3) rack-test (0.7.0) rack (>= 1.0, < 3) - rails (5.2.6) - actioncable (= 5.2.6) - actionmailer (= 5.2.6) - actionpack (= 5.2.6) - actionview (= 5.2.6) - activejob (= 5.2.6) - activemodel (= 5.2.6) - activerecord (= 5.2.6) - activestorage (= 5.2.6) - activesupport (= 5.2.6) + rails (5.2.8) + actioncable (= 5.2.8) + actionmailer (= 5.2.8) + actionpack (= 5.2.8) + actionview (= 5.2.8) + activejob (= 5.2.8) + activemodel (= 5.2.8) + activerecord (= 5.2.8) + activestorage (= 5.2.8) + activesupport (= 5.2.8) bundler (>= 1.3.0) - railties (= 5.2.6) + railties (= 5.2.8) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -806,9 +806,9 @@ GEM railties (>= 5.0, < 6) rails_autolink (1.1.6) rails (> 3.1) - railties (5.2.6) - actionpack (= 5.2.6) - activesupport (= 5.2.6) + railties (5.2.8) + actionpack (= 5.2.8) + activesupport (= 5.2.8) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0)