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
ee739f7c
Commit
ee739f7c
authored
Nov 22, 2019
by
Alper Akgun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update billing page trial CTAs
parent
1c1eda42
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
9 deletions
+6
-9
ee/app/views/shared/_gold_trial_callout_content.html.haml
ee/app/views/shared/_gold_trial_callout_content.html.haml
+1
-1
ee/app/views/shared/billings/_billing_plan_header.html.haml
ee/app/views/shared/billings/_billing_plan_header.html.haml
+0
-2
ee/changelogs/unreleased/36747-update-billing-page-trial-ctas.yml
...elogs/unreleased/36747-update-billing-page-trial-ctas.yml
+5
-0
ee/spec/features/billings/billing_plans_spec.rb
ee/spec/features/billings/billing_plans_spec.rb
+0
-6
No files found.
ee/app/views/shared/_gold_trial_callout_content.html.haml
View file @
ee739f7c
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
%p
.mb-0
%p
.mb-0
%span
=
_
(
'Try all GitLab has to offer for 30 days.'
)
%span
=
_
(
'Try all GitLab has to offer for 30 days.'
)
%span
.d-none.d-sm-inline
=
_
(
'No credit card required.'
)
%span
.d-none.d-sm-inline
=
_
(
'No credit card required.'
)
=
link_to
_
(
'Start your trial'
),
"
#{
EE
::
SUBSCRIPTIONS_URL
}
/trials/new?gl_com=true"
,
class:
"btn btn-primary mt-2 mt-sm-0
#{
button_css_class
}
"
,
target:
'_blank'
=
link_to
_
(
'Start your trial'
),
new_trial_registration_path
,
class:
"btn btn-primary mt-2 mt-sm-0
#{
button_css_class
}
"
,
target:
'_blank'
-
if
is_dismissable
-
if
is_dismissable
%button
.btn.btn-default.close.js-close
{
type:
'button'
,
%button
.btn.btn-default.close.js-close
{
type:
'button'
,
...
...
ee/app/views/shared/billings/_billing_plan_header.html.haml
View file @
ee739f7c
-
parent_group
=
local_assigns
[
:parent_group
]
-
parent_group
=
local_assigns
[
:parent_group
]
.mb-2
=
render_billings_gold_trial
(
current_user
,
parent_group
||
namespace
)
-
if
namespace_for_user?
(
namespace
)
-
if
namespace_for_user?
(
namespace
)
=
render_if_exists
'trials/banner'
,
namespace:
namespace
=
render_if_exists
'trials/banner'
,
namespace:
namespace
...
...
ee/changelogs/unreleased/36747-update-billing-page-trial-ctas.yml
0 → 100644
View file @
ee739f7c
---
title
:
Update billing page trial CTAs
merge_request
:
20383
author
:
type
:
changed
ee/spec/features/billings/billing_plans_spec.rb
View file @
ee739f7c
...
@@ -85,8 +85,6 @@ describe 'Billing plan pages', :feature do
...
@@ -85,8 +85,6 @@ describe 'Billing plan pages', :feature do
context
'users profile billing page'
do
context
'users profile billing page'
do
let
(
:page_path
)
{
profile_billings_path
}
let
(
:page_path
)
{
profile_billings_path
}
it_behaves_like
'billings gold trial callout'
context
'on free'
do
context
'on free'
do
let
(
:plan
)
{
free_plan
}
let
(
:plan
)
{
free_plan
}
...
@@ -177,8 +175,6 @@ describe 'Billing plan pages', :feature do
...
@@ -177,8 +175,6 @@ describe 'Billing plan pages', :feature do
context
'top-most group'
do
context
'top-most group'
do
let
(
:page_path
)
{
group_billings_path
(
namespace
)
}
let
(
:page_path
)
{
group_billings_path
(
namespace
)
}
it_behaves_like
'billings gold trial callout'
context
'on bronze'
do
context
'on bronze'
do
let
(
:plan
)
{
bronze_plan
}
let
(
:plan
)
{
bronze_plan
}
...
@@ -221,8 +217,6 @@ describe 'Billing plan pages', :feature do
...
@@ -221,8 +217,6 @@ describe 'Billing plan pages', :feature do
let
(
:page_path
)
{
group_billings_path
(
subgroup2
)
}
let
(
:page_path
)
{
group_billings_path
(
subgroup2
)
}
let
(
:namespace
)
{
group
}
let
(
:namespace
)
{
group
}
it_behaves_like
'billings gold trial callout'
context
'on bronze'
do
context
'on bronze'
do
let
(
:plan
)
{
bronze_plan
}
let
(
:plan
)
{
bronze_plan
}
...
...
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