From 460fbf10c3b7b26179de0404ad37314ebb26fe3a Mon Sep 17 00:00:00 2001 From: Jeff Ohrstrom Date: Wed, 7 Apr 2021 11:48:35 -0400 Subject: [PATCH] upgrade rails to 5.2.5 to avoid mimemagic dependency --- apps/activejobs/Gemfile | 2 +- apps/activejobs/Gemfile.lock | 125 ++++++++++++++++----------------- apps/dashboard/Gemfile | 2 +- apps/dashboard/Gemfile.lock | 127 +++++++++++++++++----------------- apps/file-editor/Gemfile | 2 +- apps/file-editor/Gemfile.lock | 121 ++++++++++++++++---------------- apps/myjobs/Gemfile | 2 +- apps/myjobs/Gemfile.lock | 125 ++++++++++++++++----------------- 8 files changed, 255 insertions(+), 251 deletions(-) diff --git a/apps/activejobs/Gemfile b/apps/activejobs/Gemfile index 144660b22b..9a4f0dbd2c 100644 --- a/apps/activejobs/Gemfile +++ b/apps/activejobs/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '5.2.4.4' +gem 'rails', '5.2.5' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' diff --git a/apps/activejobs/Gemfile.lock b/apps/activejobs/Gemfile.lock index f7fa9fd33b..1077e2ea3e 100644 --- a/apps/activejobs/Gemfile.lock +++ b/apps/activejobs/Gemfile.lock @@ -1,43 +1,43 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.4.4) - actionpack (= 5.2.4.4) + actioncable (5.2.5) + actionpack (= 5.2.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.4.4) - actionpack (= 5.2.4.4) - actionview (= 5.2.4.4) - activejob (= 5.2.4.4) + actionmailer (5.2.5) + actionpack (= 5.2.5) + actionview (= 5.2.5) + activejob (= 5.2.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.4.4) - actionview (= 5.2.4.4) - activesupport (= 5.2.4.4) + actionpack (5.2.5) + actionview (= 5.2.5) + activesupport (= 5.2.5) 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.4.4) - activesupport (= 5.2.4.4) + actionview (5.2.5) + activesupport (= 5.2.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.4.4) - activesupport (= 5.2.4.4) + activejob (5.2.5) + activesupport (= 5.2.5) globalid (>= 0.3.6) - activemodel (5.2.4.4) - activesupport (= 5.2.4.4) - activerecord (5.2.4.4) - activemodel (= 5.2.4.4) - activesupport (= 5.2.4.4) + activemodel (5.2.5) + activesupport (= 5.2.5) + activerecord (5.2.5) + activemodel (= 5.2.5) + activesupport (= 5.2.5) arel (>= 9.0) - activestorage (5.2.4.4) - actionpack (= 5.2.4.4) - activerecord (= 5.2.4.4) - marcel (~> 0.3.1) - activesupport (5.2.4.4) + activestorage (5.2.5) + actionpack (= 5.2.5) + activerecord (= 5.2.5) + marcel (~> 1.0.0) + activesupport (5.2.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -58,23 +58,23 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) crass (1.0.6) diff-lcs (1.4.4) dotenv (2.7.6) dotenv-rails (2.7.6) dotenv (= 2.7.6) railties (>= 3.2) - erubi (1.9.0) + erubi (1.10.0) execjs (2.7.0) - ffi (1.13.1) - font-awesome-sass (5.13.0) + ffi (1.15.0) + font-awesome-sass (5.15.1) sassc (>= 1.11) globalid (0.4.2) activesupport (>= 4.2.0) - i18n (1.8.5) + i18n (1.8.10) concurrent-ruby (~> 1.0) - jbuilder (2.10.1) + jbuilder (2.11.2) activesupport (>= 5.0.0) jquery-datatables-rails (3.4.0) actionpack (>= 3.1) @@ -90,47 +90,48 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.7.0) + loofah (2.9.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) + marcel (1.0.1) method_source (1.0.0) - mimemagic (0.3.5) - mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.2) - nio4r (2.5.4) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + mini_mime (1.1.0) + mini_portile2 (2.5.0) + minitest (5.14.4) + nio4r (2.5.7) + nokogiri (1.11.2) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) ood_appkit (1.1.5) addressable (~> 2.4) lograge (~> 0.3) ood_core (~> 0.1) rails (> 4.0.7, < 6.0) redcarpet (~> 3.2) - ood_core (0.14.0) + ood_core (0.15.1) + activesupport (>= 5.2, < 6.0) ffi (~> 1.9, >= 1.9.6) ood_support (~> 0.0.2) ood_support (0.0.3) public_suffix (4.0.6) + racc (1.5.2) rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.4.4) - actioncable (= 5.2.4.4) - actionmailer (= 5.2.4.4) - actionpack (= 5.2.4.4) - actionview (= 5.2.4.4) - activejob (= 5.2.4.4) - activemodel (= 5.2.4.4) - activerecord (= 5.2.4.4) - activestorage (= 5.2.4.4) - activesupport (= 5.2.4.4) + rails (5.2.5) + actioncable (= 5.2.5) + actionmailer (= 5.2.5) + actionpack (= 5.2.5) + actionview (= 5.2.5) + activejob (= 5.2.5) + activemodel (= 5.2.5) + activerecord (= 5.2.5) + activestorage (= 5.2.5) + activesupport (= 5.2.5) bundler (>= 1.3.0) - railties (= 5.2.4.4) + railties (= 5.2.5) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -142,23 +143,23 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (5.2.4.4) - actionpack (= 5.2.4.4) - activesupport (= 5.2.4.4) + railties (5.2.5) + actionpack (= 5.2.5) + activesupport (= 5.2.5) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (13.0.1) + rake (13.0.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - rdoc (6.2.1) - redcarpet (3.5.0) + rdoc (6.3.0) + redcarpet (3.5.1) request_store (1.5.0) rack (>= 1.4) rspec-core (3.9.3) rspec-support (~> 3.9.3) - rspec-expectations (3.9.2) + rspec-expectations (3.9.4) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-mocks (3.9.1) @@ -172,7 +173,7 @@ GEM rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) rspec-support (~> 3.9.0) - rspec-support (3.9.3) + rspec-support (3.9.4) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -186,7 +187,7 @@ GEM tilt (>= 1.1, < 3) sassc (2.4.0) ffi (~> 1.9) - sdoc (1.1.0) + sdoc (2.1.0) rdoc (>= 5.0) sprockets (3.7.2) concurrent-ruby (~> 1.0) @@ -198,7 +199,7 @@ GEM thor (0.19.1) thread_safe (0.3.6) tilt (2.0.10) - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) @@ -220,7 +221,7 @@ DEPENDENCIES jquery-rails ood_appkit (~> 1.0) rack (>= 1.6.11) - rails (= 5.2.4.4) + rails (= 5.2.5) rails_12factor rspec-rails (~> 3.9) sass-rails (~> 5.0) diff --git a/apps/dashboard/Gemfile b/apps/dashboard/Gemfile index 175f34cde6..a58e8dd012 100644 --- a/apps/dashboard/Gemfile +++ b/apps/dashboard/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '5.2.4.4' +gem 'rails', '5.2.5' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets diff --git a/apps/dashboard/Gemfile.lock b/apps/dashboard/Gemfile.lock index 68d5a9b6b7..837cfaece1 100644 --- a/apps/dashboard/Gemfile.lock +++ b/apps/dashboard/Gemfile.lock @@ -1,43 +1,43 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.4.4) - actionpack (= 5.2.4.4) + actioncable (5.2.5) + actionpack (= 5.2.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.4.4) - actionpack (= 5.2.4.4) - actionview (= 5.2.4.4) - activejob (= 5.2.4.4) + actionmailer (5.2.5) + actionpack (= 5.2.5) + actionview (= 5.2.5) + activejob (= 5.2.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.4.4) - actionview (= 5.2.4.4) - activesupport (= 5.2.4.4) + actionpack (5.2.5) + actionview (= 5.2.5) + activesupport (= 5.2.5) 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.4.4) - activesupport (= 5.2.4.4) + actionview (5.2.5) + activesupport (= 5.2.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.4.4) - activesupport (= 5.2.4.4) + activejob (5.2.5) + activesupport (= 5.2.5) globalid (>= 0.3.6) - activemodel (5.2.4.4) - activesupport (= 5.2.4.4) - activerecord (5.2.4.4) - activemodel (= 5.2.4.4) - activesupport (= 5.2.4.4) + activemodel (5.2.5) + activesupport (= 5.2.5) + activerecord (5.2.5) + activemodel (= 5.2.5) + activesupport (= 5.2.5) arel (>= 9.0) - activestorage (5.2.4.4) - actionpack (= 5.2.4.4) - activerecord (= 5.2.4.4) - marcel (~> 0.3.1) - activesupport (5.2.4.4) + activestorage (5.2.5) + actionpack (= 5.2.5) + activerecord (= 5.2.5) + marcel (~> 1.0.0) + activesupport (5.2.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -62,7 +62,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) crass (1.0.6) data-confirm-modal (1.6.3) railties (>= 3.0) @@ -70,19 +70,19 @@ GEM dotenv-rails (2.7.6) dotenv (= 2.7.6) railties (>= 3.2) - dotiw (5.1.0) + dotiw (5.3.1) activesupport i18n - erubi (1.9.0) + erubi (1.10.0) execjs (2.7.0) - ffi (1.13.1) + ffi (1.15.0) font-awesome-sass (5.12.0) sassc (>= 1.11) globalid (0.4.2) activesupport (>= 4.2.0) - i18n (1.8.5) + i18n (1.8.10) concurrent-ruby (~> 1.0) - jbuilder (2.10.1) + jbuilder (2.11.2) activesupport (>= 5.0.0) jquery-datatables-rails (3.4.0) actionpack (>= 3.1) @@ -100,55 +100,56 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.7.0) + loofah (2.9.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) + marcel (1.0.1) method_source (1.0.0) - mimemagic (0.3.5) - mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.2) - mocha (1.11.2) + mini_mime (1.1.0) + mini_portile2 (2.5.0) + minitest (5.14.4) + mocha (1.12.0) multi_json (1.15.0) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) - nio4r (2.5.4) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nio4r (2.5.7) + nokogiri (1.11.2) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) ood_appkit (1.1.5) addressable (~> 2.4) lograge (~> 0.3) ood_core (~> 0.1) rails (> 4.0.7, < 6.0) redcarpet (~> 3.2) - ood_core (0.14.0) + ood_core (0.15.1) + activesupport (>= 5.2, < 6.0) ffi (~> 1.9, >= 1.9.6) ood_support (~> 0.0.2) ood_support (0.0.3) pbs (2.2.1) ffi (~> 1.9, >= 1.9.6) public_suffix (4.0.6) + racc (1.5.2) rack (2.2.3) rack-protection (2.1.0) rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.4.4) - actioncable (= 5.2.4.4) - actionmailer (= 5.2.4.4) - actionpack (= 5.2.4.4) - actionview (= 5.2.4.4) - activejob (= 5.2.4.4) - activemodel (= 5.2.4.4) - activerecord (= 5.2.4.4) - activestorage (= 5.2.4.4) - activesupport (= 5.2.4.4) + rails (5.2.5) + actioncable (= 5.2.5) + actionmailer (= 5.2.5) + actionpack (= 5.2.5) + actionview (= 5.2.5) + activejob (= 5.2.5) + activemodel (= 5.2.5) + activerecord (= 5.2.5) + activestorage (= 5.2.5) + activesupport (= 5.2.5) bundler (>= 1.3.0) - railties (= 5.2.4.4) + railties (= 5.2.5) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -160,21 +161,21 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (5.2.4.4) - actionpack (= 5.2.4.4) - activesupport (= 5.2.4.4) + railties (5.2.5) + actionpack (= 5.2.5) + activesupport (= 5.2.5) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (13.0.1) + rake (13.0.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - rdoc (6.2.1) - redcarpet (3.5.0) + rdoc (6.3.0) + redcarpet (3.5.1) request_store (1.5.0) rack (>= 1.4) - ruby2_keywords (0.0.2) + ruby2_keywords (0.0.4) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -188,7 +189,7 @@ GEM tilt (>= 1.1, < 3) sassc (2.4.0) ffi (~> 1.9) - sdoc (1.1.0) + sdoc (2.1.0) rdoc (>= 5.0) sinatra (2.1.0) mustermann (~> 1.0) @@ -211,11 +212,11 @@ GEM thor (0.19.1) thread_safe (0.3.6) tilt (2.0.10) - timecop (0.9.1) + timecop (0.9.4) turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) @@ -249,7 +250,7 @@ DEPENDENCIES ood_core (~> 0.11) ood_support (~> 0.0.2) pbs (~> 2.2.1) - rails (= 5.2.4.4) + rails (= 5.2.5) rails_12factor redcarpet (~> 3.3) sass-rails (~> 5.0) diff --git a/apps/file-editor/Gemfile b/apps/file-editor/Gemfile index ee7e839147..c2b0c543d5 100644 --- a/apps/file-editor/Gemfile +++ b/apps/file-editor/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '5.2.4.4' +gem 'rails', '5.2.5' # Use sqlite3 as the database for Active Record # gem 'sqlite3' diff --git a/apps/file-editor/Gemfile.lock b/apps/file-editor/Gemfile.lock index c20e24c2a9..4318c7b1d1 100644 --- a/apps/file-editor/Gemfile.lock +++ b/apps/file-editor/Gemfile.lock @@ -1,43 +1,43 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.4.4) - actionpack (= 5.2.4.4) + actioncable (5.2.5) + actionpack (= 5.2.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.4.4) - actionpack (= 5.2.4.4) - actionview (= 5.2.4.4) - activejob (= 5.2.4.4) + actionmailer (5.2.5) + actionpack (= 5.2.5) + actionview (= 5.2.5) + activejob (= 5.2.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.4.4) - actionview (= 5.2.4.4) - activesupport (= 5.2.4.4) + actionpack (5.2.5) + actionview (= 5.2.5) + activesupport (= 5.2.5) 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.4.4) - activesupport (= 5.2.4.4) + actionview (5.2.5) + activesupport (= 5.2.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.4.4) - activesupport (= 5.2.4.4) + activejob (5.2.5) + activesupport (= 5.2.5) globalid (>= 0.3.6) - activemodel (5.2.4.4) - activesupport (= 5.2.4.4) - activerecord (5.2.4.4) - activemodel (= 5.2.4.4) - activesupport (= 5.2.4.4) + activemodel (5.2.5) + activesupport (= 5.2.5) + activerecord (5.2.5) + activemodel (= 5.2.5) + activesupport (= 5.2.5) arel (>= 9.0) - activestorage (5.2.4.4) - actionpack (= 5.2.4.4) - activerecord (= 5.2.4.4) - marcel (~> 0.3.1) - activesupport (5.2.4.4) + activestorage (5.2.5) + actionpack (= 5.2.5) + activerecord (= 5.2.5) + marcel (~> 1.0.0) + activesupport (5.2.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -58,22 +58,22 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) crass (1.0.6) dotenv (2.7.6) dotenv-rails (2.7.6) dotenv (= 2.7.6) railties (>= 3.2) - erubi (1.9.0) + erubi (1.10.0) execjs (2.7.0) - ffi (1.13.1) - font-awesome-sass (5.13.0) + ffi (1.15.0) + font-awesome-sass (5.15.1) sassc (>= 1.11) globalid (0.4.2) activesupport (>= 4.2.0) - i18n (1.8.5) + i18n (1.8.10) concurrent-ruby (~> 1.0) - jbuilder (2.10.1) + jbuilder (2.11.2) activesupport (>= 5.0.0) jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) @@ -84,47 +84,48 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.7.0) + loofah (2.9.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) + marcel (1.0.1) method_source (1.0.0) - mimemagic (0.3.5) - mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.2) - nio4r (2.5.4) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + mini_mime (1.1.0) + mini_portile2 (2.5.0) + minitest (5.14.4) + nio4r (2.5.7) + nokogiri (1.11.2) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) ood_appkit (1.1.5) addressable (~> 2.4) lograge (~> 0.3) ood_core (~> 0.1) rails (> 4.0.7, < 6.0) redcarpet (~> 3.2) - ood_core (0.14.0) + ood_core (0.15.1) + activesupport (>= 5.2, < 6.0) ffi (~> 1.9, >= 1.9.6) ood_support (~> 0.0.2) ood_support (0.0.3) public_suffix (4.0.6) + racc (1.5.2) rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.4.4) - actioncable (= 5.2.4.4) - actionmailer (= 5.2.4.4) - actionpack (= 5.2.4.4) - actionview (= 5.2.4.4) - activejob (= 5.2.4.4) - activemodel (= 5.2.4.4) - activerecord (= 5.2.4.4) - activestorage (= 5.2.4.4) - activesupport (= 5.2.4.4) + rails (5.2.5) + actioncable (= 5.2.5) + actionmailer (= 5.2.5) + actionpack (= 5.2.5) + actionview (= 5.2.5) + activejob (= 5.2.5) + activemodel (= 5.2.5) + activerecord (= 5.2.5) + activestorage (= 5.2.5) + activesupport (= 5.2.5) bundler (>= 1.3.0) - railties (= 5.2.4.4) + railties (= 5.2.5) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -136,18 +137,18 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (5.2.4.4) - actionpack (= 5.2.4.4) - activesupport (= 5.2.4.4) + railties (5.2.5) + actionpack (= 5.2.5) + activesupport (= 5.2.5) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (13.0.1) + rake (13.0.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - rdoc (6.2.1) - redcarpet (3.5.0) + rdoc (6.3.0) + redcarpet (3.5.1) request_store (1.5.0) rack (>= 1.4) sass (3.7.4) @@ -163,7 +164,7 @@ GEM tilt (>= 1.1, < 3) sassc (2.4.0) ffi (~> 1.9) - sdoc (1.1.0) + sdoc (2.1.0) rdoc (>= 5.0) sprockets (3.7.2) concurrent-ruby (~> 1.0) @@ -175,7 +176,7 @@ GEM thor (0.19.1) thread_safe (0.3.6) tilt (2.0.10) - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) @@ -196,7 +197,7 @@ DEPENDENCIES jquery-rails ood_appkit (~> 1.1) rack (>= 1.6.11) - rails (= 5.2.4.4) + rails (= 5.2.5) rails_12factor sass-rails (~> 5.0) sdoc diff --git a/apps/myjobs/Gemfile b/apps/myjobs/Gemfile index d6155f8835..77bfe0f285 100644 --- a/apps/myjobs/Gemfile +++ b/apps/myjobs/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '5.2.4.4' +gem 'rails', '5.2.5' # Use sqlite3 as the database for Active Record # Note that the version has been fixed due to an incompatibilty # https://github.com/rails/rails/issues/35153 diff --git a/apps/myjobs/Gemfile.lock b/apps/myjobs/Gemfile.lock index b7a322f51d..f2abcbd72d 100644 --- a/apps/myjobs/Gemfile.lock +++ b/apps/myjobs/Gemfile.lock @@ -1,43 +1,43 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.4.4) - actionpack (= 5.2.4.4) + actioncable (5.2.5) + actionpack (= 5.2.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.4.4) - actionpack (= 5.2.4.4) - actionview (= 5.2.4.4) - activejob (= 5.2.4.4) + actionmailer (5.2.5) + actionpack (= 5.2.5) + actionview (= 5.2.5) + activejob (= 5.2.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.4.4) - actionview (= 5.2.4.4) - activesupport (= 5.2.4.4) + actionpack (5.2.5) + actionview (= 5.2.5) + activesupport (= 5.2.5) 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.4.4) - activesupport (= 5.2.4.4) + actionview (5.2.5) + activesupport (= 5.2.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.4.4) - activesupport (= 5.2.4.4) + activejob (5.2.5) + activesupport (= 5.2.5) globalid (>= 0.3.6) - activemodel (5.2.4.4) - activesupport (= 5.2.4.4) - activerecord (5.2.4.4) - activemodel (= 5.2.4.4) - activesupport (= 5.2.4.4) + activemodel (5.2.5) + activesupport (= 5.2.5) + activerecord (5.2.5) + activemodel (= 5.2.5) + activesupport (= 5.2.5) arel (>= 9.0) - activestorage (5.2.4.4) - actionpack (= 5.2.4.4) - activerecord (= 5.2.4.4) - marcel (~> 0.3.1) - activesupport (5.2.4.4) + activestorage (5.2.5) + actionpack (= 5.2.5) + activerecord (= 5.2.5) + marcel (~> 1.0.0) + activesupport (5.2.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -61,22 +61,22 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) crass (1.0.6) dotenv (2.7.6) dotenv-rails (2.7.6) dotenv (= 2.7.6) railties (>= 3.2) - erubi (1.9.0) + erubi (1.10.0) execjs (2.7.0) - ffi (1.13.1) - font-awesome-sass (5.13.0) + ffi (1.15.0) + font-awesome-sass (5.15.1) sassc (>= 1.11) globalid (0.4.2) activesupport (>= 4.2.0) - i18n (1.8.5) + i18n (1.8.10) concurrent-ruby (~> 1.0) - jbuilder (2.10.1) + jbuilder (2.11.2) activesupport (>= 5.0.0) jquery-datatables-rails (3.4.0) actionpack (>= 3.1) @@ -97,30 +97,30 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.7.0) + loofah (2.9.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) + marcel (1.0.1) method_source (1.0.0) - mimemagic (0.3.5) - mini_mime (1.0.2) - mini_portile2 (2.4.0) - mocha (1.11.2) - minitest (5.14.2) + mini_mime (1.1.0) + mini_portile2 (2.5.0) + minitest (5.14.4) + mocha (1.12.0) mustache (1.1.1) - nio4r (2.5.4) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nio4r (2.5.7) + nokogiri (1.11.2) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) ood_appkit (1.1.5) addressable (~> 2.4) lograge (~> 0.3) ood_core (~> 0.1) rails (> 4.0.7, < 6.0) redcarpet (~> 3.2) - ood_core (0.14.0) + ood_core (0.15.1) + activesupport (>= 5.2, < 6.0) ffi (~> 1.9, >= 1.9.6) ood_support (~> 0.0.2) ood_support (0.0.3) @@ -133,21 +133,22 @@ GEM pbs (2.2.1) ffi (~> 1.9, >= 1.9.6) public_suffix (4.0.6) + racc (1.5.2) rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.4.4) - actioncable (= 5.2.4.4) - actionmailer (= 5.2.4.4) - actionpack (= 5.2.4.4) - actionview (= 5.2.4.4) - activejob (= 5.2.4.4) - activemodel (= 5.2.4.4) - activerecord (= 5.2.4.4) - activestorage (= 5.2.4.4) - activesupport (= 5.2.4.4) + rails (5.2.5) + actioncable (= 5.2.5) + actionmailer (= 5.2.5) + actionpack (= 5.2.5) + actionview (= 5.2.5) + activejob (= 5.2.5) + activemodel (= 5.2.5) + activerecord (= 5.2.5) + activestorage (= 5.2.5) + activesupport (= 5.2.5) bundler (>= 1.3.0) - railties (= 5.2.4.4) + railties (= 5.2.5) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -163,18 +164,18 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (5.2.4.4) - actionpack (= 5.2.4.4) - activesupport (= 5.2.4.4) + railties (5.2.5) + actionpack (= 5.2.5) + activesupport (= 5.2.5) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (13.0.1) + rake (13.0.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - rdoc (6.2.1) - redcarpet (3.5.0) + rdoc (6.3.0) + redcarpet (3.5.1) request_store (1.5.0) rack (>= 1.4) sass (3.7.4) @@ -190,7 +191,7 @@ GEM tilt (>= 1.1, < 3) sassc (2.4.0) ffi (~> 1.9) - sdoc (1.1.0) + sdoc (2.1.0) rdoc (>= 5.0) sprockets (3.7.2) concurrent-ruby (~> 1.0) @@ -203,8 +204,8 @@ GEM thor (0.19.1) thread_safe (0.3.6) tilt (2.0.10) - timecop (0.9.1) - tzinfo (1.2.7) + timecop (0.9.4) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) @@ -233,7 +234,7 @@ DEPENDENCIES ood_appkit (~> 1.1.4) osc_machete_rails (~> 1.3.0) pbs (~> 2.2.1) - rails (= 5.2.4.4) + rails (= 5.2.5) rails-controller-testing rails_12factor sass-rails (~> 5.0)