Commit bb3fe4a1 authored by Alex Kalderimis's avatar Alex Kalderimis

Merge branch '334205-send-setup-for-company-to-customersdot' into 'master'

Send setup_for_company to CustomersDot in trial form

See merge request gitlab-org/gitlab!70569
parents 896c02a4 b7e4d09e
...@@ -95,6 +95,7 @@ module Registrations ...@@ -95,6 +95,7 @@ module Registrations
first_name: current_user.first_name, first_name: current_user.first_name,
last_name: current_user.last_name, last_name: current_user.last_name,
uid: current_user.id, uid: current_user.id,
setup_for_company: current_user.setup_for_company,
skip_email_confirmation: true, skip_email_confirmation: true,
gitlab_com_trial: true, gitlab_com_trial: true,
provider: 'gitlab', provider: 'gitlab',
......
...@@ -92,6 +92,7 @@ class TrialsController < ApplicationController ...@@ -92,6 +92,7 @@ class TrialsController < ApplicationController
attrs = {} attrs = {}
attrs[:work_email] = current_user.email attrs[:work_email] = current_user.email
attrs[:uid] = current_user.id attrs[:uid] = current_user.id
attrs[:setup_for_company] = current_user.setup_for_company
attrs[:skip_email_confirmation] = true attrs[:skip_email_confirmation] = true
attrs[:gitlab_com_trial] = true attrs[:gitlab_com_trial] = true
attrs[:provider] = 'gitlab' attrs[:provider] = 'gitlab'
......
...@@ -135,6 +135,7 @@ RSpec.describe Registrations::GroupsController do ...@@ -135,6 +135,7 @@ RSpec.describe Registrations::GroupsController do
first_name: user.first_name, first_name: user.first_name,
last_name: user.last_name, last_name: user.last_name,
uid: user.id, uid: user.id,
setup_for_company: nil,
skip_email_confirmation: true, skip_email_confirmation: true,
gitlab_com_trial: true, gitlab_com_trial: true,
provider: 'gitlab', provider: 'gitlab',
......
...@@ -179,6 +179,7 @@ RSpec.describe TrialsController do ...@@ -179,6 +179,7 @@ RSpec.describe TrialsController do
{ {
work_email: user.email, work_email: user.email,
uid: user.id, uid: user.id,
setup_for_company: nil,
skip_email_confirmation: true, skip_email_confirmation: true,
gitlab_com_trial: true, gitlab_com_trial: true,
provider: 'gitlab', provider: 'gitlab',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment