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
142f38b5
Commit
142f38b5
authored
Dec 07, 2020
by
Mark Chao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove api_billable_member_list feature flag
The API is stable.
parent
511736f2
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
8 additions
and
37 deletions
+8
-37
ee/app/assets/javascripts/billings/subscriptions/components/subscription_table_row.vue
...lings/subscriptions/components/subscription_table_row.vue
+2
-4
ee/app/assets/javascripts/billings/subscriptions/index.js
ee/app/assets/javascripts/billings/subscriptions/index.js
+0
-1
ee/app/controllers/groups/billings_controller.rb
ee/app/controllers/groups/billings_controller.rb
+0
-1
ee/app/controllers/groups/seat_usage_controller.rb
ee/app/controllers/groups/seat_usage_controller.rb
+0
-1
ee/app/helpers/billing_plans_helper.rb
ee/app/helpers/billing_plans_helper.rb
+0
-2
ee/changelogs/unreleased/254947-roll-out.yml
ee/changelogs/unreleased/254947-roll-out.yml
+5
-0
ee/config/feature_flags/development/api_billable_member_list.yml
...ig/feature_flags/development/api_billable_member_list.yml
+0
-8
ee/lib/ee/api/members.rb
ee/lib/ee/api/members.rb
+0
-2
ee/spec/frontend/billings/subscriptions/components/subscription_table_row_spec.js
...s/subscriptions/components/subscription_table_row_spec.js
+1
-6
ee/spec/requests/api/members_spec.rb
ee/spec/requests/api/members_spec.rb
+0
-12
No files found.
ee/app/assets/javascripts/billings/subscriptions/components/subscription_table_row.vue
View file @
142f38b5
...
@@ -26,14 +26,12 @@ export default {
...
@@ -26,14 +26,12 @@ export default {
default
:
false
,
default
:
false
,
},
},
},
},
inject
:
[
'
billableSeatsHref
'
,
'
apiBillableMemberListFeatureEnabled
'
],
inject
:
[
'
billableSeatsHref
'
],
computed
:
{
computed
:
{
...
mapState
([
'
hasBillableGroupMembers
'
]),
...
mapState
([
'
hasBillableGroupMembers
'
]),
},
},
created
()
{
created
()
{
if
(
this
.
apiBillableMemberListFeatureEnabled
)
{
this
.
fetchHasBillableGroupMembers
();
this
.
fetchHasBillableGroupMembers
();
}
},
},
methods
:
{
methods
:
{
...
mapActions
([
'
fetchHasBillableGroupMembers
'
]),
...
mapActions
([
'
fetchHasBillableGroupMembers
'
]),
...
...
ee/app/assets/javascripts/billings/subscriptions/index.js
View file @
142f38b5
...
@@ -31,7 +31,6 @@ export default (containerId = 'js-billing-plans') => {
...
@@ -31,7 +31,6 @@ export default (containerId = 'js-billing-plans') => {
planRenewHref
,
planRenewHref
,
customerPortalUrl
,
customerPortalUrl
,
billableSeatsHref
,
billableSeatsHref
,
apiBillableMemberListFeatureEnabled
:
gon
?.
features
?.
apiBillableMemberList
||
false
,
},
},
render
(
createElement
)
{
render
(
createElement
)
{
return
createElement
(
SubscriptionApp
);
return
createElement
(
SubscriptionApp
);
...
...
ee/app/controllers/groups/billings_controller.rb
View file @
142f38b5
...
@@ -5,7 +5,6 @@ class Groups::BillingsController < Groups::ApplicationController
...
@@ -5,7 +5,6 @@ class Groups::BillingsController < Groups::ApplicationController
before_action
:verify_namespace_plan_check_enabled
before_action
:verify_namespace_plan_check_enabled
before_action
only:
[
:index
]
do
before_action
only:
[
:index
]
do
push_frontend_feature_flag
(
:api_billable_member_list
)
push_frontend_feature_flag
(
:saas_manual_renew_button
)
push_frontend_feature_flag
(
:saas_manual_renew_button
)
end
end
...
...
ee/app/controllers/groups/seat_usage_controller.rb
View file @
142f38b5
...
@@ -9,6 +9,5 @@ class Groups::SeatUsageController < Groups::ApplicationController
...
@@ -9,6 +9,5 @@ class Groups::SeatUsageController < Groups::ApplicationController
feature_category
:purchase
feature_category
:purchase
def
show
def
show
render_404
unless
Feature
.
enabled?
(
:api_billable_member_list
,
@group
)
end
end
end
end
ee/app/helpers/billing_plans_helper.rb
View file @
142f38b5
...
@@ -102,8 +102,6 @@ module BillingPlansHelper
...
@@ -102,8 +102,6 @@ module BillingPlansHelper
end
end
def
billable_seats_href
(
group
)
def
billable_seats_href
(
group
)
return
unless
Feature
.
enabled?
(
:api_billable_member_list
,
group
)
group_seat_usage_path
(
group
)
group_seat_usage_path
(
group
)
end
end
end
end
ee/changelogs/unreleased/254947-roll-out.yml
0 → 100644
View file @
142f38b5
---
title
:
Enable billable_members feature
merge_request
:
49336
author
:
type
:
added
ee/config/feature_flags/development/api_billable_member_list.yml
deleted
100644 → 0
View file @
511736f2
---
name
:
api_billable_member_list
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43093
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/254947
milestone
:
'
13.5'
type
:
development
group
:
group::fulfillment
default_enabled
:
false
ee/lib/ee/api/members.rb
View file @
142f38b5
...
@@ -51,8 +51,6 @@ module EE
...
@@ -51,8 +51,6 @@ module EE
get
":id/billable_members"
do
get
":id/billable_members"
do
group
=
find_group!
(
params
[
:id
])
group
=
find_group!
(
params
[
:id
])
not_found!
unless
::
Feature
.
enabled?
(
:api_billable_member_list
,
group
)
bad_request!
(
nil
)
if
group
.
subgroup?
bad_request!
(
nil
)
if
group
.
subgroup?
bad_request!
(
nil
)
unless
::
Ability
.
allowed?
(
current_user
,
:admin_group_member
,
group
)
bad_request!
(
nil
)
unless
::
Ability
.
allowed?
(
current_user
,
:admin_group_member
,
group
)
...
...
ee/spec/frontend/billings/subscriptions/components/subscription_table_row_spec.js
View file @
142f38b5
...
@@ -39,11 +39,7 @@ describe('subscription table row', () => {
...
@@ -39,11 +39,7 @@ describe('subscription table row', () => {
const
defaultProps
=
{
header
:
HEADER
,
columns
:
COLUMNS
};
const
defaultProps
=
{
header
:
HEADER
,
columns
:
COLUMNS
};
const
createComponent
=
({
const
createComponent
=
({
props
=
{},
billableSeatsHref
=
BILLABLE_SEATS_URL
}
=
{})
=>
{
props
=
{},
apiBillableMemberListFeatureEnabled
=
true
,
billableSeatsHref
=
BILLABLE_SEATS_URL
,
}
=
{})
=>
{
if
(
wrapper
)
{
if
(
wrapper
)
{
throw
new
Error
(
'
wrapper already exists!
'
);
throw
new
Error
(
'
wrapper already exists!
'
);
}
}
...
@@ -54,7 +50,6 @@ describe('subscription table row', () => {
...
@@ -54,7 +50,6 @@ describe('subscription table row', () => {
...
props
,
...
props
,
},
},
provide
:
{
provide
:
{
apiBillableMemberListFeatureEnabled
,
billableSeatsHref
,
billableSeatsHref
,
},
},
store
,
store
,
...
...
ee/spec/requests/api/members_spec.rb
View file @
142f38b5
...
@@ -377,18 +377,6 @@ RSpec.describe API::Members do
...
@@ -377,18 +377,6 @@ RSpec.describe API::Members do
end
end
end
end
context
'when feature is disabled'
do
before
do
stub_feature_flags
(
api_billable_member_list:
false
)
end
it
'returns error'
do
subject
expect
(
response
).
to
have_gitlab_http_status
(
:not_found
)
end
end
context
'with non owner'
do
context
'with non owner'
do
it
'returns error'
do
it
'returns error'
do
get
api
(
url
,
maintainer
)
get
api
(
url
,
maintainer
)
...
...
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