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
8db16c7a
Commit
8db16c7a
authored
Aug 30, 2019
by
Vitaly Slobodin
Committed by
Douglas Barbosa Alexandre
Sep 10, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add username to billing page
Message about current plan should include username of the current user
parent
419d0865
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
ee/app/views/shared/billings/_billing_plan_header.html.haml
ee/app/views/shared/billings/_billing_plan_header.html.haml
+1
-1
ee/spec/features/billings/billing_plans_spec.rb
ee/spec/features/billings/billing_plans_spec.rb
+2
-2
locale/gitlab.pot
locale/gitlab.pot
+3
-3
No files found.
ee/app/views/shared/billings/_billing_plan_header.html.haml
View file @
8db16c7a
...
...
@@ -16,7 +16,7 @@
%h4
-
plan_link
=
plan
.
about_page_href
?
link_to
(
plan
.
code
.
titleize
,
plan
.
about_page_href
)
:
plan
.
name
-
if
namespace
==
current_user
.
namespace
=
s_
(
"BillingPlans|
You are currently using the %{plan_link} plan."
).
html_safe
%
{
plan_link:
plan_link
}
=
s_
(
"BillingPlans|
@%{user_name} you are currently using the %{plan_link} plan."
).
html_safe
%
{
user_name:
current_user
.
username
,
plan_link:
plan_link
}
-
else
=
s_
(
"BillingPlans|%{group_name} is currently using the %{plan_link} plan."
).
html_safe
%
{
group_name:
namespace
.
full_name
,
plan_link:
plan_link
}
...
...
ee/spec/features/billings/billing_plans_spec.rb
View file @
8db16c7a
...
...
@@ -92,7 +92,7 @@ describe 'Billing plan pages', :feature do
it
'displays header and actions'
do
page
.
within
(
'.billing-plan-header'
)
do
expect
(
page
).
to
have_content
(
'You are currently using the Bronze plan.'
)
expect
(
page
).
to
have_content
(
"
#{
user
.
username
}
you are currently using the Bronze plan."
)
expect
(
page
).
to
have_css
(
'.billing-plan-logo img'
)
end
...
...
@@ -118,7 +118,7 @@ describe 'Billing plan pages', :feature do
it
'displays header and actions'
do
page
.
within
(
'.billing-plan-header'
)
do
expect
(
page
).
to
have_content
(
'You are currently using the Gold plan.'
)
expect
(
page
).
to
have_content
(
"
#{
user
.
username
}
you are currently using the Gold plan."
)
expect
(
page
).
to
have_css
(
'.billing-plan-logo img'
)
end
...
...
locale/gitlab.pot
View file @
8db16c7a
...
...
@@ -2224,6 +2224,9 @@ msgstr ""
msgid "BillingPlans|%{group_name} is currently using the %{plan_link} plan."
msgstr ""
msgid "BillingPlans|@%{user_name} you are currently using the %{plan_link} plan."
msgstr ""
msgid "BillingPlans|Current plan"
msgstr ""
...
...
@@ -2257,9 +2260,6 @@ msgstr ""
msgid "BillingPlans|Upgrade"
msgstr ""
msgid "BillingPlans|You are currently using the %{plan_link} plan."
msgstr ""
msgid "BillingPlans|Your GitLab.com trial expired on %{expiration_date}. %{learn_more_text}"
msgstr ""
...
...
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