OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

WIP (#15222)

pull/15926/head
Eugen Rochko 2021-03-19 17:15:36 +01:00 committed by GitHub
parent 741d0952b1
commit af8fe6e1e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/concerns/omniauthable.rb
View File

@ -68,7 +68,6 @@ module Omniauthable
def user_params_from_auth(email, auth) def user_params_from_auth(email, auth)
{ {
email: email || "#{TEMP_EMAIL_PREFIX}-#{auth.uid}-#{auth.provider}.com", email: email || "#{TEMP_EMAIL_PREFIX}-#{auth.uid}-#{auth.provider}.com",
password: Devise.friendly_token[0, 20],
agreement: true, agreement: true,
external: true, external: true,
account_attributes: { account_attributes: {

2
app/models/user.rb
View File

@ -468,7 +468,7 @@ class User < ApplicationRecord
end end
def validate_email_dns? def validate_email_dns?
email_changed? && !(Rails.env.test? || Rails.env.development?) email_changed? && !external? && !(Rails.env.test? || Rails.env.development?)
end end
def invite_text_required? def invite_text_required?