Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a9855588
Commit
a9855588
authored
Apr 07, 2020
by
Alper Akgun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hide company question for new account signups
It's a duplicate question
parent
8c7f358a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
10 deletions
+14
-10
ee/app/views/trials/select.html.haml
ee/app/views/trials/select.html.haml
+2
-1
ee/changelogs/unreleased/202095-adjust-trial-setup-questions-when-user-comes-directly-from-acco.yml
...al-setup-questions-when-user-comes-directly-from-acco.yml
+5
-0
ee/spec/features/trials/select_namespace_spec.rb
ee/spec/features/trials/select_namespace_spec.rb
+7
-9
No files found.
ee/app/views/trials/select.html.haml
View file @
a9855588
-
page_title
_
(
'Start a Free Gold Trial'
)
-
glm_params
=
{
glm_source:
params
[
:glm_source
],
glm_content:
params
[
:glm_content
]
}
-
should_ask_company_question
=
glm_params
[
:glm_source
]
!=
'about.gitlab.com'
%h3
.center.pt-6
=
_
(
'Almost there'
)
...
...
@@ -16,7 +17,7 @@
#group_name
.form-group.hidden
=
label_tag
:new_group_name
,
_
(
'New Group Name'
),
for: :new_group_name
,
class:
'col-form-label'
=
text_field_tag
:new_group_name
,
nil
,
class:
'form-control'
-
if
current_user
.
setup_for_company
.
nil?
-
if
should_ask_company_question
.form-group
=
label_tag
:trial_entity
,
_
(
'Is this GitLab trial for your company?'
)
.gl-form-checkbox-group
...
...
ee/changelogs/unreleased/202095-adjust-trial-setup-questions-when-user-comes-directly-from-acco.yml
0 → 100644
View file @
a9855588
---
title
:
Hide company question for new account signups
merge_request
:
27563
author
:
type
:
changed
ee/spec/features/trials/select_namespace_spec.rb
View file @
a9855588
...
...
@@ -14,25 +14,23 @@ describe 'Trial Select Namespace', :js do
end
context
'when user'
do
let
(
:
setup_for_company
)
{
nil
}
let
(
:
url_params
)
{
{}
}
before
do
user
.
update!
setup_for_company:
setup_for_company
visit
select_trials_path
visit
select_trials_path
(
url_params
)
wait_for_all_requests
choose
:trial_entity_company
if
setup_for_company
.
nil?
choose
:trial_entity_company
if
url_params
[
:glm_source
]
!=
'about.gitlab.com'
end
context
'when s
etup_for_company is not chosen
'
do
it
'shows company/individual
duplicate
question'
do
context
'when s
ource is not about.gitlab.com
'
do
it
'shows company/individual question'
do
expect
(
page
).
to
have_content
(
'Is this GitLab trial for your company?'
)
end
end
context
'when s
etup_for_company is already chosen
'
do
let
(
:
setup_for_company
)
{
true
}
context
'when s
ource is about.gitlab.com
'
do
let
(
:
url_params
)
{
{
glm_source:
'about.gitlab.com'
}
}
it
'hides company/individual duplicate question'
do
expect
(
page
).
not_to
have_content
(
'Is this GitLab trial for your company?'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment