From 5a81c93b20b9b358165fe5db78f4f784764de40d Mon Sep 17 00:00:00 2001 From: David Czulada Date: Tue, 24 Sep 2024 13:55:10 -0400 Subject: [PATCH] other changes --- Gemfile | 4 ++-- Gemfile.lock | 22 +++++++++++----------- app/assets/javascripts/application.js | 2 +- app/views/records/show.html.erb | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Gemfile b/Gemfile index b3883113c..a7141d889 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ gem 'bootstrap', '~> 5.3.3' gem 'dartsass-sprockets' gem 'font-awesome-sass', '~> 5.0.13' -gem 'jquery-rails', '~> 4.4.0' +gem 'jquery-rails' # TODO: remove or use gem gem 'jquery-ui-rails', git: 'https://github.com/jquery-ui-rails/jquery-ui-rails', tag: 'v7.0.0' @@ -44,7 +44,7 @@ gem 'uglifier', '>= 1.3.0' # Bake the best breadcrumbs gem 'breadcrumbs_on_rails' # Help our forms -gem 'bootstrap_form', '~> 2.7.0' +gem 'bootstrap_form', '~> 2.7' gem 'jasny-bootstrap-rails' gem 'nested_form' diff --git a/Gemfile.lock b/Gemfile.lock index cd0624846..56d5d270c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -159,7 +159,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) cqm-models (4.2.0) cqm-parsers (4.1.1.0) activesupport (> 5.0) @@ -261,7 +261,7 @@ GEM domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) dumb_delegator (1.0.0) - erubi (1.12.0) + erubi (1.13.0) erubis (2.7.0) ethon (0.16.0) ffi (>= 1.15.0) @@ -285,7 +285,7 @@ GEM highline (1.7.10) http-cookie (1.0.5) domain_name (~> 0.5) - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) ice_nine (0.11.2) image_processing (1.12.2) @@ -302,7 +302,7 @@ GEM jquery-rails railties (>= 3.1) sass-rails - jquery-rails (4.4.0) + jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -339,7 +339,7 @@ GEM mini_magick (4.12.0) mini_mime (1.1.5) mini_portile2 (2.8.7) - minitest (5.23.1) + minitest (5.25.1) minitest-rails (7.0.0) minitest (~> 5.10) railties (~> 7.0.0) @@ -379,7 +379,7 @@ GEM netrc (0.11.0) newrelic_rpm (8.15.0) nio4r (2.7.3) - nokogiri (1.16.5) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) orm_adapter (0.5.0) @@ -402,7 +402,7 @@ GEM pry-nav (1.0.0) pry (>= 0.9.10, < 0.15) public_suffix (5.0.5) - racc (1.8.0) + racc (1.8.1) rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) @@ -547,7 +547,7 @@ GEM test_xml (0.1.8) diffy (~> 3.0) nokogiri (>= 1.3.2) - thor (1.3.1) + thor (1.3.2) thread_safe (0.3.6) tilt (2.0.11) timeout (0.4.1) @@ -597,7 +597,7 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.15) + zeitwerk (2.6.18) zip-zip (0.3) rubyzip (>= 1.0.0) @@ -609,7 +609,7 @@ DEPENDENCIES axe-core-cucumber bootsnap bootstrap (~> 5.3.3) - bootstrap_form (~> 2.7.0) + bootstrap_form (~> 2.7) breadcrumbs_on_rails bson bundler-audit @@ -637,7 +637,7 @@ DEPENDENCIES jasny-bootstrap-rails jbuilder (~> 2.11.0) jquery-datatables-rails - jquery-rails (~> 4.4.0) + jquery-rails jquery-ui-rails! kaminari-mongoid launchy diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 8a5c5a533..eef8d4f76 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -25,7 +25,7 @@ //= require local-time //= require_tree . //= require popper -//= require bootstrap +//= require bootstrap-sprockets // will cover turbolinks changes (ajax already covered by rails ujs) // this is necessary for CSRF tokens in changed form elements diff --git a/app/views/records/show.html.erb b/app/views/records/show.html.erb index bf41fafaf..0e6d34633 100644 --- a/app/views/records/show.html.erb +++ b/app/views/records/show.html.erb @@ -117,7 +117,7 @@
-