diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-07 06:09:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-07 06:09:30 +0300 |
commit | 923a8c950c009e65fd17ae2ab6c5e245a66175b5 (patch) | |
tree | a7a2a3167d392cbcb75ee0f1d9613139904e2723 /app | |
parent | 6ac97de78e3aee0c27bd08c15999db1b6be5c75a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 | ||||
-rw-r--r-- | app/services/users/email_verification/base_service.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index dc84216e000..d632689a4f6 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -865,6 +865,7 @@ $security-and-compliance-carousel-image-discover-text-carousel-max-width: 650px; $security-and-compliance-carousel-image-discover-text-carousel-caption-height: 100%; $security-and-compliance-carousel-image-discover-text-carousel-caption-max-width: 500px; $security-and-compliance-carousel-control-icon-width: 10px; +$security-and-compliance-carousel-control-icon-middle-width: 20px; $security-and-compliance-carousel-control-position: -5%; $security-and-compliance-carousel-inner-width: 90%; $security-and-compliance-carousel-indicators-bottom: -20px; diff --git a/app/services/users/email_verification/base_service.rb b/app/services/users/email_verification/base_service.rb index 721290fe056..174626ac2f9 100644 --- a/app/services/users/email_verification/base_service.rb +++ b/app/services/users/email_verification/base_service.rb @@ -21,7 +21,7 @@ module Users end def digest - Devise.token_generator.digest(User, user.email, token) + Devise.token_generator.digest(User, user.email.downcase.strip, token) end end end |