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
daa7e56f
Commit
daa7e56f
authored
Aug 14, 2019
by
Vitaly Slobodin
Committed by
Douglas Barbosa Alexandre
Sep 10, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address review comments
parent
3c21e1d2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
10 deletions
+5
-10
ee/app/views/shared/billings/_billing_plan_header.html.haml
ee/app/views/shared/billings/_billing_plan_header.html.haml
+1
-1
ee/spec/frontend/billings/store/modules/subscription/mock_subscription.json
...illings/store/modules/subscription/mock_subscription.json
+0
-9
ee/spec/frontend/billings/store/modules/subscription/mutations_spec.js
...end/billings/store/modules/subscription/mutations_spec.js
+4
-0
No files found.
ee/app/views/shared/billings/_billing_plan_header.html.haml
View file @
daa7e56f
...
...
@@ -13,7 +13,7 @@
.avatar-container.rect-avatar.s96.home-panel-avatar.append-right-default.float-none.mx-auto.mb-4.mt-1.rounded.border
=
group_icon
(
@group
,
class:
'avatar avatar-tile s96'
,
width:
96
,
height:
96
,
alt:
@group
.
name
)
%h4
.h4
%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|@%{user_name} you are currently on the %{plan_link} plan."
).
html_safe
%
{
user_name:
current_user
.
username
,
plan_link:
plan_link
}
...
...
ee/spec/frontend/billings/store/modules/subscription/mock_subscription.json
deleted
100644 → 0
View file @
3c21e1d2
{
"plan"
:
{
"code"
:
"bronze"
,
"name"
:
"Bronze"
,
"trial"
:
null
,
"upgradable"
:
true
},
"usage"
:
{
"seats_in_subscription"
:
0
,
"seats_in_use"
:
1
,
"max_seats_used"
:
0
,
"seats_owed"
:
0
},
"billing"
:
{
"subscription_start_date"
:
"2019-07-31"
,
"subscription_end_date"
:
null
,
"trial_ends_on"
:
null
}
}
ee/spec/frontend/billings/store/modules/subscription/mutations_spec.js
View file @
daa7e56f
...
...
@@ -75,6 +75,10 @@ describe('EE billings subscription module mutations', () => {
expect
(
getStateTableValues
(
tableKey
)).
toMatchSnapshot
();
});
});
it
(
'
sets table values
'
,
()
=>
{
expect
(
getStateTableValues
(
'
free
'
)).
toMatchSnapshot
();
});
});
describe
(
types
.
RECEIVE_SUBSCRIPTION_ERROR
,
()
=>
{
...
...
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