diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /app/controllers/registrations/welcome_controller.rb | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) | |
download | gitlab-ce-9dc93a4519d9d5d7be48ff274127136236a3adb3.tar.gz |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'app/controllers/registrations/welcome_controller.rb')
-rw-r--r-- | app/controllers/registrations/welcome_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/registrations/welcome_controller.rb b/app/controllers/registrations/welcome_controller.rb index a1a6a057171..62ec03206c4 100644 --- a/app/controllers/registrations/welcome_controller.rb +++ b/app/controllers/registrations/welcome_controller.rb @@ -35,7 +35,7 @@ module Registrations end def update_params - params.require(:user).permit(:role, :other_role, :setup_for_company) + params.require(:user).permit(:role, :other_role, :setup_for_company, :email_opted_in) end def requires_confirmation?(user) |