From 85dc423f7090da0a52c73eb66faf22ddb20efff9 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Sat, 19 Sep 2020 01:45:44 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-4-stable-ee

---
 app/services/users/build_service.rb  | 1 -
 app/services/users/signup_service.rb | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'app/services/users')

diff --git a/app/services/users/build_service.rb b/app/services/users/build_service.rb
index f06f00a5c3f..2fc46f033dd 100644
--- a/app/services/users/build_service.rb
+++ b/app/services/users/build_service.rb
@@ -91,7 +91,6 @@ module Users
     def signup_params
       [
         :email,
-        :email_confirmation,
         :password_automatically_set,
         :name,
         :first_name,
diff --git a/app/services/users/signup_service.rb b/app/services/users/signup_service.rb
index 1031cec44cb..1087ae76216 100644
--- a/app/services/users/signup_service.rb
+++ b/app/services/users/signup_service.rb
@@ -27,7 +27,7 @@ module Users
     def inject_validators
       class << @user
         validates :role, presence: true
-        validates :setup_for_company, inclusion: { in: [true, false], message: :blank }
+        validates :setup_for_company, inclusion: { in: [true, false], message: :blank } if Gitlab.com?
       end
     end
   end
-- 
cgit v1.2.3