diff --git a/Appraisals b/Appraisals
index 1e92de144..cee24e37d 100644
--- a/Appraisals
+++ b/Appraisals
@@ -2,21 +2,12 @@
 
 appraise 'rails-6.0' do
   gem 'rails', '~> 6.0.0'
-  gem 'sassc-rails', '~> 2.1'
-  gem 'devise', '~> 4.7'
 
   group :test do
-    gem 'cancancan', '~> 3.0'
-    gem 'kt-paperclip'
     gem 'pundit', '~> 2.1.0'
-    gem 'rspec-rails', '>= 4.0.0.beta2'
-    gem 'shrine', '~> 3.0'
   end
 
   group :active_record do
-    gem 'pg', '>= 1.0.0', platforms: :ruby
-    gem 'paper_trail', '>= 12.0'
-
     platforms :jruby do
       gem 'activerecord-jdbcmysql-adapter', '~> 60.0'
       gem 'activerecord-jdbcpostgresql-adapter', '~> 60.0'
@@ -26,30 +17,13 @@ appraise 'rails-6.0' do
 
   group :mongoid do
     gem 'mongoid', '~> 7.0'
-    gem 'kaminari-mongoid'
-    gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
-    gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
-    gem 'cancancan-mongoid'
-    gem 'shrine-mongoid', '~> 1.0'
   end
 end
 
 appraise 'rails-6.1' do
   gem 'rails', '~> 6.1.0'
-  gem 'sassc-rails', '~> 2.1'
-  gem 'devise', '~> 4.7'
-
-  group :test do
-    gem 'cancancan', '~> 3.2'
-    gem 'kt-paperclip'
-    gem 'rspec-rails', '>= 4.0.0.beta2'
-    gem 'shrine', '~> 3.0'
-  end
 
   group :active_record do
-    gem 'pg', '>= 1.0.0', platforms: :ruby
-    gem 'paper_trail', '>= 12.0'
-
     platforms :jruby do
       gem 'activerecord-jdbcmysql-adapter', '~> 61.0'
       gem 'activerecord-jdbcpostgresql-adapter', '~> 61.0'
@@ -59,31 +33,14 @@ appraise 'rails-6.1' do
 
   group :mongoid do
     gem 'mongoid', '~> 7.0'
-    gem 'kaminari-mongoid'
-    gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
-    gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
-    gem 'cancancan-mongoid'
-    gem 'shrine-mongoid', '~> 1.0'
   end
 end
 
 appraise 'rails-7.0' do
   gem 'rails', '~> 7.0.0'
   gem 'importmap-rails', require: false
-  gem 'sassc-rails', '~> 2.1'
-  gem 'devise', '~> 4.8'
-
-  group :test do
-    gem 'cancancan', '~> 3.2'
-    gem 'kt-paperclip'
-    gem 'rspec-rails', '>= 4.0.0.beta2'
-    gem 'shrine', '~> 3.0'
-  end
 
   group :active_record do
-    gem 'pg', '>= 1.0.0', platforms: :ruby
-    gem 'paper_trail', '>= 12.0'
-
     platforms :jruby do
       gem 'activerecord-jdbcmysql-adapter', '~> 70.0'
       gem 'activerecord-jdbcpostgresql-adapter', '~> 70.0'
@@ -93,56 +50,22 @@ appraise 'rails-7.0' do
 
   group :mongoid do
     gem 'mongoid', '~> 8.0'
-    gem 'kaminari-mongoid'
-    gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
-    gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
-    gem 'cancancan-mongoid'
-    gem 'shrine-mongoid', '~> 1.0'
   end
 end
 
 appraise 'rails-7.1' do
   gem 'rails', '~> 7.1.0'
   gem 'importmap-rails', require: false
-  gem 'sassc-rails', '~> 2.1'
-  gem 'devise', '~> 4.8'
-
-  group :test do
-    gem 'cancancan', '~> 3.2'
-    gem 'kt-paperclip'
-    gem 'rspec-rails', '>= 4.0.0.beta2'
-    gem 'shrine', '~> 3.0'
-  end
-
-  group :active_record do
-    gem 'pg', '>= 1.0.0', platforms: :ruby
-    gem 'paper_trail', '>= 12.0'
-  end
 
   group :mongoid do
     gem 'mongoid', '~> 8.0'
-    gem 'kaminari-mongoid'
-    gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
-    gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
-    gem 'cancancan-mongoid'
-    gem 'shrine-mongoid', '~> 1.0'
   end
 end
 
 appraise 'composite_primary_keys' do
   gem 'rails', '~> 7.0.0'
-  gem 'sassc-rails', '~> 2.1'
-  gem 'devise', '~> 4.8'
-
-  group :test do
-    gem 'cancancan', '~> 3.2'
-    gem 'kt-paperclip'
-    gem 'rspec-rails', '>= 4.0.0.beta2'
-    gem 'shrine', '~> 3.0'
-  end
 
   group :active_record do
     gem 'composite_primary_keys'
-    gem 'paper_trail', '>= 12.0'
   end
 end
diff --git a/Gemfile b/Gemfile
index 651b893fb..49a684db3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,22 +3,14 @@
 source 'https://rubygems.org'
 
 gem 'appraisal', '>= 2.0'
-gem 'devise'
+gem 'devise', '~> 4.7'
 gem 'net-smtp', require: false
 gem 'rails'
+gem 'sassc-rails', '~> 2.1'
 gem 'vite_rails', require: false
 gem 'webpacker', require: false
 gem 'webrick'
 
-group :active_record do
-  gem 'paper_trail'
-
-  platforms :ruby, :mswin, :mingw, :x64_mingw do
-    gem 'mysql2', '>= 0.3.14'
-    gem 'sqlite3', '>= 1.3'
-  end
-end
-
 group :development, :test do
   gem 'pry', '>= 0.9'
 end
@@ -32,15 +24,17 @@ group :test do
   gem 'dragonfly', '~> 1.0'
   gem 'factory_bot', '>= 4.2'
   gem 'generator_spec', '>= 0.8'
+  gem 'kt-paperclip'
   gem 'launchy', '>= 2.2'
   gem 'mini_magick', '>= 3.4'
   gem 'pundit'
   gem 'rack-cache', require: 'rack/cache'
   gem 'rspec-expectations', '!= 3.8.3'
-  gem 'rspec-rails', '>= 2.14'
+  gem 'rspec-rails', '>= 4.0.0.beta2'
   gem 'rspec-retry'
   gem 'rubocop', ['~> 1.20', '!= 1.22.2'], require: false
   gem 'rubocop-performance', require: false
+  gem 'shrine', '~> 3.0'
   gem 'simplecov', '>= 0.9', require: false
   gem 'simplecov-lcov', require: false
   gem 'timecop', '>= 0.5'
@@ -49,4 +43,22 @@ group :test do
   gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
 end
 
+group :active_record do
+  gem 'paper_trail', '>= 12.0'
+
+  platforms :ruby, :mswin, :mingw, :x64_mingw do
+    gem 'mysql2', '>= 0.3.14'
+    gem 'pg', '>= 1.0.0'
+    gem 'sqlite3', '>= 1.3'
+  end
+end
+
+group :mongoid do
+  gem 'kaminari-mongoid'
+  gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
+  gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
+  gem 'cancancan-mongoid'
+  gem 'shrine-mongoid', '~> 1.0'
+end
+
 gemspec
diff --git a/gemfiles/composite_primary_keys.gemfile b/gemfiles/composite_primary_keys.gemfile
index 0fb1481bf..90d94d59a 100644
--- a/gemfiles/composite_primary_keys.gemfile
+++ b/gemfiles/composite_primary_keys.gemfile
@@ -3,30 +3,20 @@
 source "https://rubygems.org"
 
 gem "appraisal", ">= 2.0"
-gem "devise", "~> 4.8"
+gem "devise", "~> 4.7"
 gem "net-smtp", require: false
 gem "rails", "~> 7.0.0"
+gem "sassc-rails", "~> 2.1"
 gem "vite_rails", require: false
 gem "webpacker", require: false
 gem "webrick"
-gem "sassc-rails", "~> 2.1"
-
-group :active_record do
-  gem "paper_trail", ">= 12.0"
-  gem "composite_primary_keys"
-
-  platforms :ruby, :mswin, :mingw, :x64_mingw do
-    gem "mysql2", ">= 0.3.14"
-    gem "sqlite3", ">= 1.3"
-  end
-end
 
 group :development, :test do
   gem "pry", ">= 0.9"
 end
 
 group :test do
-  gem "cancancan", "~> 3.2"
+  gem "cancancan", "~> 3.0"
   gem "carrierwave", [">= 2.0.0.rc", "< 3"]
   gem "cuprite"
   gem "database_cleaner-active_record", ">= 2.0", require: false
@@ -34,6 +24,7 @@ group :test do
   gem "dragonfly", "~> 1.0"
   gem "factory_bot", ">= 4.2"
   gem "generator_spec", ">= 0.8"
+  gem "kt-paperclip"
   gem "launchy", ">= 2.2"
   gem "mini_magick", ">= 3.4"
   gem "pundit"
@@ -43,12 +34,30 @@ group :test do
   gem "rspec-retry"
   gem "rubocop", ["~> 1.20", "!= 1.22.2"], require: false
   gem "rubocop-performance", require: false
+  gem "shrine", "~> 3.0"
   gem "simplecov", ">= 0.9", require: false
   gem "simplecov-lcov", require: false
   gem "timecop", ">= 0.5"
   gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-  gem "kt-paperclip"
-  gem "shrine", "~> 3.0"
+end
+
+group :active_record do
+  gem "paper_trail", ">= 12.0"
+  gem "composite_primary_keys"
+
+  platforms :ruby, :mswin, :mingw, :x64_mingw do
+    gem "mysql2", ">= 0.3.14"
+    gem "pg", ">= 1.0.0"
+    gem "sqlite3", ">= 1.3"
+  end
+end
+
+group :mongoid do
+  gem "kaminari-mongoid"
+  gem "mongoid-paperclip", ">= 0.0.8", require: "mongoid_paperclip"
+  gem "carrierwave-mongoid", ">= 0.6.3", require: "carrierwave/mongoid"
+  gem "cancancan-mongoid"
+  gem "shrine-mongoid", "~> 1.0"
 end
 
 gemspec path: "../"
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
index 0e3b83744..e4cc4781e 100644
--- a/gemfiles/rails_6.0.gemfile
+++ b/gemfiles/rails_6.0.gemfile
@@ -6,26 +6,10 @@ gem "appraisal", ">= 2.0"
 gem "devise", "~> 4.7"
 gem "net-smtp", require: false
 gem "rails", "~> 6.0.0"
+gem "sassc-rails", "~> 2.1"
 gem "vite_rails", require: false
 gem "webpacker", require: false
 gem "webrick"
-gem "sassc-rails", "~> 2.1"
-
-group :active_record do
-  gem "paper_trail", ">= 12.0"
-  gem "pg", ">= 1.0.0", platforms: :ruby
-
-  platforms :ruby, :mswin, :mingw, :x64_mingw do
-    gem "mysql2", ">= 0.3.14"
-    gem "sqlite3", ">= 1.3"
-  end
-
-  platforms :jruby do
-    gem "activerecord-jdbcmysql-adapter", "~> 60.0"
-    gem "activerecord-jdbcpostgresql-adapter", "~> 60.0"
-    gem "activerecord-jdbcsqlite3-adapter", "~> 60.0"
-  end
-end
 
 group :development, :test do
   gem "pry", ">= 0.9"
@@ -40,6 +24,7 @@ group :test do
   gem "dragonfly", "~> 1.0"
   gem "factory_bot", ">= 4.2"
   gem "generator_spec", ">= 0.8"
+  gem "kt-paperclip"
   gem "launchy", ">= 2.2"
   gem "mini_magick", ">= 3.4"
   gem "pundit", "~> 2.1.0"
@@ -49,21 +34,36 @@ group :test do
   gem "rspec-retry"
   gem "rubocop", ["~> 1.20", "!= 1.22.2"], require: false
   gem "rubocop-performance", require: false
+  gem "shrine", "~> 3.0"
   gem "simplecov", ">= 0.9", require: false
   gem "simplecov-lcov", require: false
   gem "timecop", ">= 0.5"
   gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-  gem "kt-paperclip"
-  gem "shrine", "~> 3.0"
+end
+
+group :active_record do
+  gem "paper_trail", ">= 12.0"
+
+  platforms :ruby, :mswin, :mingw, :x64_mingw do
+    gem "mysql2", ">= 0.3.14"
+    gem "pg", ">= 1.0.0"
+    gem "sqlite3", ">= 1.3"
+  end
+
+  platforms :jruby do
+    gem "activerecord-jdbcmysql-adapter", "~> 60.0"
+    gem "activerecord-jdbcpostgresql-adapter", "~> 60.0"
+    gem "activerecord-jdbcsqlite3-adapter", "~> 60.0"
+  end
 end
 
 group :mongoid do
-  gem "mongoid", "~> 7.0"
   gem "kaminari-mongoid"
   gem "mongoid-paperclip", ">= 0.0.8", require: "mongoid_paperclip"
   gem "carrierwave-mongoid", ">= 0.6.3", require: "carrierwave/mongoid"
   gem "cancancan-mongoid"
   gem "shrine-mongoid", "~> 1.0"
+  gem "mongoid", "~> 7.0"
 end
 
 gemspec path: "../"
diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
index 1e78acde2..86da792af 100644
--- a/gemfiles/rails_6.1.gemfile
+++ b/gemfiles/rails_6.1.gemfile
@@ -6,33 +6,17 @@ gem "appraisal", ">= 2.0"
 gem "devise", "~> 4.7"
 gem "net-smtp", require: false
 gem "rails", "~> 6.1.0"
+gem "sassc-rails", "~> 2.1"
 gem "vite_rails", require: false
 gem "webpacker", require: false
 gem "webrick"
-gem "sassc-rails", "~> 2.1"
-
-group :active_record do
-  gem "paper_trail", ">= 12.0"
-  gem "pg", ">= 1.0.0", platforms: :ruby
-
-  platforms :ruby, :mswin, :mingw, :x64_mingw do
-    gem "mysql2", ">= 0.3.14"
-    gem "sqlite3", ">= 1.3"
-  end
-
-  platforms :jruby do
-    gem "activerecord-jdbcmysql-adapter", "~> 61.0"
-    gem "activerecord-jdbcpostgresql-adapter", "~> 61.0"
-    gem "activerecord-jdbcsqlite3-adapter", "~> 61.0"
-  end
-end
 
 group :development, :test do
   gem "pry", ">= 0.9"
 end
 
 group :test do
-  gem "cancancan", "~> 3.2"
+  gem "cancancan", "~> 3.0"
   gem "carrierwave", [">= 2.0.0.rc", "< 3"]
   gem "cuprite"
   gem "database_cleaner-active_record", ">= 2.0", require: false
@@ -40,6 +24,7 @@ group :test do
   gem "dragonfly", "~> 1.0"
   gem "factory_bot", ">= 4.2"
   gem "generator_spec", ">= 0.8"
+  gem "kt-paperclip"
   gem "launchy", ">= 2.2"
   gem "mini_magick", ">= 3.4"
   gem "pundit"
@@ -49,21 +34,36 @@ group :test do
   gem "rspec-retry"
   gem "rubocop", ["~> 1.20", "!= 1.22.2"], require: false
   gem "rubocop-performance", require: false
+  gem "shrine", "~> 3.0"
   gem "simplecov", ">= 0.9", require: false
   gem "simplecov-lcov", require: false
   gem "timecop", ">= 0.5"
   gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-  gem "kt-paperclip"
-  gem "shrine", "~> 3.0"
+end
+
+group :active_record do
+  gem "paper_trail", ">= 12.0"
+
+  platforms :ruby, :mswin, :mingw, :x64_mingw do
+    gem "mysql2", ">= 0.3.14"
+    gem "pg", ">= 1.0.0"
+    gem "sqlite3", ">= 1.3"
+  end
+
+  platforms :jruby do
+    gem "activerecord-jdbcmysql-adapter", "~> 61.0"
+    gem "activerecord-jdbcpostgresql-adapter", "~> 61.0"
+    gem "activerecord-jdbcsqlite3-adapter", "~> 61.0"
+  end
 end
 
 group :mongoid do
-  gem "mongoid", "~> 7.0"
   gem "kaminari-mongoid"
   gem "mongoid-paperclip", ">= 0.0.8", require: "mongoid_paperclip"
   gem "carrierwave-mongoid", ">= 0.6.3", require: "carrierwave/mongoid"
   gem "cancancan-mongoid"
   gem "shrine-mongoid", "~> 1.0"
+  gem "mongoid", "~> 7.0"
 end
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
index 173311957..a7673e604 100644
--- a/gemfiles/rails_7.0.gemfile
+++ b/gemfiles/rails_7.0.gemfile
@@ -3,37 +3,21 @@
 source "https://rubygems.org"
 
 gem "appraisal", ">= 2.0"
-gem "devise", "~> 4.8"
+gem "devise", "~> 4.7"
 gem "net-smtp", require: false
 gem "rails", "~> 7.0.0"
+gem "sassc-rails", "~> 2.1"
 gem "vite_rails", require: false
 gem "webpacker", require: false
 gem "webrick"
 gem "importmap-rails", require: false
-gem "sassc-rails", "~> 2.1"
-
-group :active_record do
-  gem "paper_trail", ">= 12.0"
-  gem "pg", ">= 1.0.0", platforms: :ruby
-
-  platforms :ruby, :mswin, :mingw, :x64_mingw do
-    gem "mysql2", ">= 0.3.14"
-    gem "sqlite3", ">= 1.3"
-  end
-
-  platforms :jruby do
-    gem "activerecord-jdbcmysql-adapter", "~> 70.0"
-    gem "activerecord-jdbcpostgresql-adapter", "~> 70.0"
-    gem "activerecord-jdbcsqlite3-adapter", "~> 70.0"
-  end
-end
 
 group :development, :test do
   gem "pry", ">= 0.9"
 end
 
 group :test do
-  gem "cancancan", "~> 3.2"
+  gem "cancancan", "~> 3.0"
   gem "carrierwave", [">= 2.0.0.rc", "< 3"]
   gem "cuprite"
   gem "database_cleaner-active_record", ">= 2.0", require: false
@@ -41,6 +25,7 @@ group :test do
   gem "dragonfly", "~> 1.0"
   gem "factory_bot", ">= 4.2"
   gem "generator_spec", ">= 0.8"
+  gem "kt-paperclip"
   gem "launchy", ">= 2.2"
   gem "mini_magick", ">= 3.4"
   gem "pundit"
@@ -50,21 +35,36 @@ group :test do
   gem "rspec-retry"
   gem "rubocop", ["~> 1.20", "!= 1.22.2"], require: false
   gem "rubocop-performance", require: false
+  gem "shrine", "~> 3.0"
   gem "simplecov", ">= 0.9", require: false
   gem "simplecov-lcov", require: false
   gem "timecop", ">= 0.5"
   gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-  gem "kt-paperclip"
-  gem "shrine", "~> 3.0"
+end
+
+group :active_record do
+  gem "paper_trail", ">= 12.0"
+
+  platforms :ruby, :mswin, :mingw, :x64_mingw do
+    gem "mysql2", ">= 0.3.14"
+    gem "pg", ">= 1.0.0"
+    gem "sqlite3", ">= 1.3"
+  end
+
+  platforms :jruby do
+    gem "activerecord-jdbcmysql-adapter", "~> 70.0"
+    gem "activerecord-jdbcpostgresql-adapter", "~> 70.0"
+    gem "activerecord-jdbcsqlite3-adapter", "~> 70.0"
+  end
 end
 
 group :mongoid do
-  gem "mongoid", "~> 8.0"
   gem "kaminari-mongoid"
   gem "mongoid-paperclip", ">= 0.0.8", require: "mongoid_paperclip"
   gem "carrierwave-mongoid", ">= 0.6.3", require: "carrierwave/mongoid"
   gem "cancancan-mongoid"
   gem "shrine-mongoid", "~> 1.0"
+  gem "mongoid", "~> 8.0"
 end
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile
index 63c853169..4f288b907 100644
--- a/gemfiles/rails_7.1.gemfile
+++ b/gemfiles/rails_7.1.gemfile
@@ -3,31 +3,21 @@
 source "https://rubygems.org"
 
 gem "appraisal", ">= 2.0"
-gem "devise", "~> 4.8"
+gem "devise", "~> 4.7"
 gem "net-smtp", require: false
 gem "rails", "~> 7.1.0"
+gem "sassc-rails", "~> 2.1"
 gem "vite_rails", require: false
 gem "webpacker", require: false
 gem "webrick"
 gem "importmap-rails", require: false
-gem "sassc-rails", "~> 2.1"
-
-group :active_record do
-  gem "paper_trail", ">= 12.0"
-  gem "pg", ">= 1.0.0", platforms: :ruby
-
-  platforms :ruby, :mswin, :mingw, :x64_mingw do
-    gem "mysql2", ">= 0.3.14"
-    gem "sqlite3", ">= 1.3"
-  end
-end
 
 group :development, :test do
   gem "pry", ">= 0.9"
 end
 
 group :test do
-  gem "cancancan", "~> 3.2"
+  gem "cancancan", "~> 3.0"
   gem "carrierwave", [">= 2.0.0.rc", "< 3"]
   gem "cuprite"
   gem "database_cleaner-active_record", ">= 2.0", require: false
@@ -35,6 +25,7 @@ group :test do
   gem "dragonfly", "~> 1.0"
   gem "factory_bot", ">= 4.2"
   gem "generator_spec", ">= 0.8"
+  gem "kt-paperclip"
   gem "launchy", ">= 2.2"
   gem "mini_magick", ">= 3.4"
   gem "pundit"
@@ -44,21 +35,30 @@ group :test do
   gem "rspec-retry"
   gem "rubocop", ["~> 1.20", "!= 1.22.2"], require: false
   gem "rubocop-performance", require: false
+  gem "shrine", "~> 3.0"
   gem "simplecov", ">= 0.9", require: false
   gem "simplecov-lcov", require: false
   gem "timecop", ">= 0.5"
   gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-  gem "kt-paperclip"
-  gem "shrine", "~> 3.0"
+end
+
+group :active_record do
+  gem "paper_trail", ">= 12.0"
+
+  platforms :ruby, :mswin, :mingw, :x64_mingw do
+    gem "mysql2", ">= 0.3.14"
+    gem "pg", ">= 1.0.0"
+    gem "sqlite3", ">= 1.3"
+  end
 end
 
 group :mongoid do
-  gem "mongoid", "~> 8.0"
   gem "kaminari-mongoid"
   gem "mongoid-paperclip", ">= 0.0.8", require: "mongoid_paperclip"
   gem "carrierwave-mongoid", ">= 0.6.3", require: "carrierwave/mongoid"
   gem "cancancan-mongoid"
   gem "shrine-mongoid", "~> 1.0"
+  gem "mongoid", "~> 8.0"
 end
 
 gemspec path: "../"