Merge commit '389a6cc4c0' into upstream-20231108

2023-11-08 10:41:10 +09:00 · 2023-11-08 10:41:10 +09:00 · 08f86bcb8f
commit 08f86bcb8f
parent 408da2c42a 389a6cc4c0
107 changed files with 970 additions and 703 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.local? # rubocop:disable Rails/UnknownEnv
+    email_changed? && !external? && !Rails.env.local?
  end

  def validate_role_elevation