This website works better with JavaScript.
Home
Explore
Help
Sign In
closed-social
/
mastodon
Watch
3
Star
0
Fork
2
Code
Issues
5
Pull Requests
0
Projects
0
Releases
3
Wiki
Activity
Browse Source
WIP (
#15222
)
closed-social-v3
Eugen Rochko
3 years ago
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
Split View
Diff Options
Show Stats
Download Patch File
Download Diff File
+0
-1
app/models/concerns/omniauthable.rb
+1
-1
app/models/user.rb
+ 0
- 1
app/models/concerns/omniauthable.rb
View File
@ -68,7 +68,6 @@ module Omniauthable
def
user_params_from_auth
(
email
,
auth
)
{
email
:
email
||
"
#{
TEMP_EMAIL_PREFIX
}
-
#{
auth
.
uid
}
-
#{
auth
.
provider
}
.com
"
,
password
:
Devise
.
friendly_token
[
0
,
20
]
,
agreement
:
true
,
external
:
true
,
account_attributes
:
{
+ 1
- 1
app/models/user.rb
View File
@ -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?
Write
Preview
Loading…
Cancel
Save