Add latest changes from gitlab-org/gitlab@master

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