diff options
| author | ThibG <thib@sitedethib.com> | 2020-07-15 16:56:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-15 16:56:33 +0200 |
| commit | 37c092e9fdedd36c167e4b84610e7346c446e1d3 (patch) | |
| tree | 88992f2d65c83ece4e93f0b4b5c34ffed0989138 /app/models/concerns | |
| parent | 7a23347db5be3f262dbcafbecf768588dc648bda (diff) | |
| parent | 470458da13586db0e6ca074987fecfc80293d955 (diff) | |
Merge pull request #1382 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/concerns')
| -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 736da6c1d..4ea219537 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.regexp(%w(http https))}\z/ + user.account.avatar_remote_url = auth.info.image if auth.info.image =~ /\A#{URI::DEFAULT_PARSER.make_regexp(%w(http https))}\z/ user.skip_confirmation! user.save! user |