Merge branch 'main' into glitch-soc/merge-upstream

2021-03-24 10:53:50 +01:00
parent d7c1c41859 88d69d3261
commit f60c99a8fb
53 changed files with 684 additions and 404 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -468,7 +468,7 @@ class User < ApplicationRecord
  end

  def validate_email_dns?
-    email_changed? && !(Rails.env.test? || Rails.env.development?)
+    email_changed? && !external? && !(Rails.env.test? || Rails.env.development?)
  end

  def invite_text_required?