Merge branch 'master' into master

Gemfile

@@ -6,7 +6,7 @@ ruby '3.3.2'
 
 gem 'bcrypt'
 gem 'bootsnap', require: false
-gem 'bootstrap-sass', '~> 3.4.1'
+gem 'bootstrap', '~> 4.0'
 gem 'cancancan'
 gem 'font-awesome-rails'
 gem 'importmap-rails', '~> 2.0'
@@ -16,6 +16,7 @@ gem 'puma'
 gem 'rails', '~> 7.1.0'
 gem 'rails-i18n', '~> 7.0'
 gem 'sassc-rails', '>= 2.1.0'
+gem 'turbo-rails'
 
 group :development, :test do
   gem 'capybara'

Gemfile.lock

@@ -85,9 +85,10 @@ GEM
     bigdecimal (3.1.8)
     bootsnap (1.18.3)
       msgpack (~> 1.2)
-    bootstrap-sass (3.4.1)
-      autoprefixer-rails (>= 5.2.1)
-      sassc (>= 2.0.0)
+    bootstrap (4.6.2)
+      autoprefixer-rails (>= 9.1.0)
+      popper_js (>= 1.16.1, < 2)
+      sassc-rails (>= 2.0.0)
     builder (3.3.0)
     cancancan (3.6.1)
     capybara (3.40.0)
@@ -171,6 +172,7 @@ GEM
       ast (~> 2.4.1)
       racc
     pg (1.5.6)
+    popper_js (1.16.1)
     psych (5.1.2)
       stringio
     public_suffix (5.0.5)
@@ -285,6 +287,10 @@ GEM
     thor (1.3.1)
     tilt (2.3.0)
     timeout (0.4.1)
+    turbo-rails (2.0.5)
+      actionpack (>= 6.0.0)
+      activejob (>= 6.0.0)
+      railties (>= 6.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
@@ -302,7 +308,7 @@ PLATFORMS
 DEPENDENCIES
   bcrypt
   bootsnap
-  bootstrap-sass (~> 3.4.1)
+  bootstrap (~> 4.0)
   cancancan
   capybara
   factory_bot_rails
@@ -319,6 +325,7 @@ DEPENDENCIES
   rubocop
   rubocop-rails
   sassc-rails (>= 2.1.0)
+  turbo-rails
 
 RUBY VERSION
    ruby 3.3.2p78

app/assets/stylesheets/bootstrap_flatly.css.scss

@@ -1,7 +1,6 @@
 $icon-font-path: "/assets/";
 
 @import "flatly/variables";
-@import "bootstrap-sprockets";
 @import "bootstrap";
 @import "bootstrap/mixins";
 @import "flatly/bootswatch";