Use Rails.env.local? shorthand method to check env (mastodon#27519)

kmycode · Oct 26, 2023 · 12550a6 · 12550a6
1 parent 4aa05d4
commit 12550a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -488,7 +488,7 @@ def needs_feed_update?
   end
 
   def validate_email_dns?
-    email_changed? && !external? && !(Rails.env.test? || Rails.env.development?)
+    email_changed? && !external? && !Rails.env.local? # rubocop:disable Rails/UnknownEnv
   end
 
   def validate_role_elevation

diff --git a/config/application.rb b/config/application.rb
@@ -206,7 +206,7 @@ class Application < Rails::Application
     # We use our own middleware for this
     config.public_file_server.enabled = false
 
-    config.middleware.use PublicFileServerMiddleware if Rails.env.development? || Rails.env.test? || ENV['RAILS_SERVE_STATIC_FILES'] == 'true'
+    config.middleware.use PublicFileServerMiddleware if Rails.env.local? || ENV['RAILS_SERVE_STATIC_FILES'] == 'true' # rubocop:disable Rails/UnknownEnv
     config.middleware.use Rack::Attack
     config.middleware.use Mastodon::RackMiddleware