diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-02-09 12:46:12 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-02-09 12:46:12 +0100 |
| commit | 85558a5e18a58247606954050a5866e62c877f91 (patch) | |
| tree | 982808241c0f64c20f8eec9b1ce5651b3c5195da /app/helpers/email_helper.rb | |
| parent | 76b4e7727b7497c1b68e06133831701f8950ae19 (diff) | |
| parent | c5a4d8c82ddd5265abc830959a58cdaf1f061a43 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes.
Diffstat (limited to 'app/helpers/email_helper.rb')
| -rw-r--r-- | app/helpers/email_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/email_helper.rb b/app/helpers/email_helper.rb index 360783c62..0800601f9 100644 --- a/app/helpers/email_helper.rb +++ b/app/helpers/email_helper.rb @@ -7,7 +7,7 @@ module EmailHelper def email_to_canonical_email(str) username, domain = str.downcase.split('@', 2) - username, = username.gsub('.', '').split('+', 2) + username, = username.delete('.').split('+', 2) "#{username}@#{domain}" end |