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
f016b226
Commit
f016b226
authored
Sep 21, 2020
by
Jacki Bauer
Committed by
Illya Klymov
Sep 21, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update UI Text in Trial Confirmation Banner
parent
989d53d3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
ee/app/views/trials/_banner.html.haml
ee/app/views/trials/_banner.html.haml
+1
-1
ee/spec/features/trials/show_trial_banner_spec.rb
ee/spec/features/trials/show_trial_banner_spec.rb
+3
-3
locale/gitlab.pot
locale/gitlab.pot
+1
-1
No files found.
ee/app/views/trials/_banner.html.haml
View file @
f016b226
...
@@ -7,4 +7,4 @@
...
@@ -7,4 +7,4 @@
=
custom_icon
(
'trial_activated_banner'
)
=
custom_icon
(
'trial_activated_banner'
)
.user-callout-copy
.user-callout-copy
%h4
%h4
=
s_
(
"BillingPlans|Congratulations, your
new trial is activated
"
)
=
s_
(
"BillingPlans|Congratulations, your
free trial is activated.
"
)
ee/spec/features/trials/show_trial_banner_spec.rb
View file @
f016b226
...
@@ -31,7 +31,7 @@ RSpec.describe 'Show trial banner', :js do
...
@@ -31,7 +31,7 @@ RSpec.describe 'Show trial banner', :js do
it
'renders congratulations banner for user in profile billing page'
do
it
'renders congratulations banner for user in profile billing page'
do
visit
profile_billings_path
+
'?trial=true'
visit
profile_billings_path
+
'?trial=true'
expect
(
page
).
to
have_content
(
'Congratulations, your
new trial is activated
'
)
expect
(
page
).
to
have_content
(
'Congratulations, your
free trial is activated.
'
)
end
end
end
end
...
@@ -39,13 +39,13 @@ RSpec.describe 'Show trial banner', :js do
...
@@ -39,13 +39,13 @@ RSpec.describe 'Show trial banner', :js do
it
'renders congratulations banner for group in group details page'
do
it
'renders congratulations banner for group in group details page'
do
visit
group_path
(
group
,
trial:
true
)
visit
group_path
(
group
,
trial:
true
)
expect
(
find
(
'.user-callout'
).
text
).
to
have_content
(
'Congratulations, your
new trial is activated
'
)
expect
(
find
(
'.user-callout'
).
text
).
to
have_content
(
'Congratulations, your
free trial is activated.
'
)
end
end
it
'does not render congratulations banner for group in group billing page'
do
it
'does not render congratulations banner for group in group billing page'
do
visit
group_billings_path
(
group
,
trial:
true
)
visit
group_billings_path
(
group
,
trial:
true
)
expect
(
page
).
not_to
have_content
(
'Congratulations, your
new trial is activated
'
)
expect
(
page
).
not_to
have_content
(
'Congratulations, your
free trial is activated.
'
)
end
end
end
end
end
end
locale/gitlab.pot
View file @
f016b226
...
@@ -3964,7 +3964,7 @@ msgstr ""
...
@@ -3964,7 +3964,7 @@ msgstr ""
msgid "BillingPlans|@%{user_name} you are currently using the %{plan_name} plan."
msgid "BillingPlans|@%{user_name} you are currently using the %{plan_name} plan."
msgstr ""
msgstr ""
msgid "BillingPlans|Congratulations, your
new trial is activated
"
msgid "BillingPlans|Congratulations, your
free trial is activated.
"
msgstr ""
msgstr ""
msgid "BillingPlans|If you would like to downgrade your plan please contact %{support_link_start}Customer Support%{support_link_end}."
msgid "BillingPlans|If you would like to downgrade your plan please contact %{support_link_start}Customer Support%{support_link_end}."
...
...
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