Remove pre Rails 7.1 conditionals

mysociety · Jan 13, 2025 · 7390bd4 · 7390bd4
1 parent 07d60e7
commit 7390bd4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -77,15 +77,9 @@
   # to make Rails upgrades easier.
   # ----------------------------------------------------------------
 
-  if Rails.version < '7.1.0'
-    config.action_mailer.preview_path = Rails.root.join(
-      'spec', 'mailers', 'previews'
-    )
-  else
-    config.action_mailer.preview_paths = [
-      Rails.root.join('spec', 'mailers', 'previews')
-    ]
-  end
+  config.action_mailer.preview_paths = [
+    Rails.root.join('spec', 'mailers', 'previews')
+  ]
 
   # Set LOG_LEVEL in the environment to a valid log level to temporarily run the
   # application with a non-default setting.

diff --git a/lib/no_constraint_disabling.rb b/lib/no_constraint_disabling.rb
@@ -26,11 +26,7 @@ module ActiveRecord
   class FixtureSet
     def self.create_fixtures(fixtures_directory, fixture_set_names, class_names = {}, config = ActiveRecord::Base)
       fixture_set_names = Array(fixture_set_names).map(&:to_s)
-      if Rails.version < '7.1.0'
-        class_names = ClassCache.new class_names, config
-      else
-        class_names.stringify_keys!
-      end
+      class_names.stringify_keys!
 
       # FIXME: Apparently JK uses this.
       connection = block_given? ? yield : ActiveRecord::Base.connection