Merge remote-tracking branch 'parent/main' into upstream-20231027

2023-10-27 08:35:05 +09:00 · 2023-10-27 08:35:05 +09:00 · 26ecad7067
commit 26ecad7067
parent 1d8862712a 12550a6a28
53 changed files with 397 additions and 294 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -490,7 +490,7 @@ class User < ApplicationRecord
  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