diff options
| author | ThibG <thib@sitedethib.com> | 2021-01-26 23:21:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 23:21:32 +0100 |
| commit | 52ff3ca675ecac0ff32990b6321fb5e349e6dc59 (patch) | |
| tree | eeeeeead25872b19b34b31e3ccbd543d3e2fd9b8 /app/models | |
| parent | ca6c62068e35537251cc650c8b2d03a1a2163d06 (diff) | |
| parent | 00e55445b9aa5a399a9f8b76e42fde9da2c399fd (diff) | |
Merge pull request #1491 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/concerns/omniauthable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/omniauthable.rb b/app/models/concerns/omniauthable.rb index 4ea219537..79d671d10 100644 --- a/app/models/concerns/omniauthable.rb +++ b/app/models/concerns/omniauthable.rb @@ -57,7 +57,7 @@ module Omniauthable user = User.new(user_params_from_auth(email, auth)) - user.account.avatar_remote_url = auth.info.image if auth.info.image =~ /\A#{URI::DEFAULT_PARSER.make_regexp(%w(http https))}\z/ + user.account.avatar_remote_url = auth.info.image if /\A#{URI::DEFAULT_PARSER.make_regexp(%w(http https))}\z/.match?(auth.info.image) user.skip_confirmation! user.save! user |