Merge pull request #1503 from sanger/develop

Develop into Master
sanger · Dec 9, 2024 · 0e7aa55 · 0e7aa55
2 parents dda5839 + 2516504
commit 0e7aa55
Show file tree

Hide file tree

Showing 5 changed files with 574 additions and 8 deletions.
diff --git a/.release-version b/.release-version
@@ -1 +1 @@
-7.19.2
+7.20.0
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -189,7 +189,7 @@ GEM
     psych (5.2.0)
       stringio
     public_suffix (6.0.1)
-    puma (6.4.3)
+    puma (6.5.0)
       nio4r (~> 2.0)
     racc (1.8.1)
     rack (2.2.10)

diff --git a/config/application.rb b/config/application.rb
@@ -44,10 +44,6 @@ class Application < Rails::Application
 
     config.mailer = config_for(:mailer)
 
-    # Make it Rails 7 ready
-    config.autoload_paths += %W{#{Rails.root}/app}
-    config.eager_load_paths += %W{#{Rails.root}/app}
-
      # Rails 5
     config.middleware.insert_before 0, Rack::Cors do
       allow do