Merge pull request #540 from ministryofjustice/rails-7-cleanup

Rails 7 cleanup
ministryofjustice · Aug 4, 2023 · 3bd5378 · 3bd5378
2 parents c911a7c + b6c6763
commit 3bd5378
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 150 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -161,7 +161,8 @@ workflows:
             - test
           filters:
             branches:
-              only: master
+              only: 
+                - master
       - deploy_to_test_dev:
           context: *moj-forms-context
           requires:

diff --git a/config/application.rb b/config/application.rb
@@ -21,7 +21,7 @@
 module FbUserFilestore
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.2
+    config.load_defaults 7.0
 
     # Configuration for the application, engines, and railties goes here.
     #

diff --git a/config/initializers/new_framework_defaults_7_0.rb b/config/initializers/new_framework_defaults_7_0.rb