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
8c9e0677
Commit
8c9e0677
authored
Jan 21, 2021
by
Sean McGivern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename provision category to license
parent
24590717
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
14 additions
and
13 deletions
+14
-13
config/feature_categories.yml
config/feature_categories.yml
+2
-1
ee/app/controllers/admin/licenses/usage_exports_controller.rb
...pp/controllers/admin/licenses/usage_exports_controller.rb
+1
-1
ee/app/controllers/admin/licenses_controller.rb
ee/app/controllers/admin/licenses_controller.rb
+1
-1
ee/app/controllers/ee/admin/application_settings_controller.rb
...p/controllers/ee/admin/application_settings_controller.rb
+1
-1
ee/app/workers/active_user_count_threshold_worker.rb
ee/app/workers/active_user_count_threshold_worker.rb
+1
-1
ee/app/workers/all_queues.yml
ee/app/workers/all_queues.yml
+4
-4
ee/app/workers/historical_data_worker.rb
ee/app/workers/historical_data_worker.rb
+1
-1
ee/app/workers/sync_seat_link_request_worker.rb
ee/app/workers/sync_seat_link_request_worker.rb
+1
-1
ee/app/workers/sync_seat_link_worker.rb
ee/app/workers/sync_seat_link_worker.rb
+1
-1
ee/lib/api/license.rb
ee/lib/api/license.rb
+1
-1
No files found.
config/feature_categories.yml
View file @
8c9e0677
...
...
@@ -66,6 +66,7 @@
-
jenkins_importer
-
jira_importer
-
kubernetes_management
-
license
-
license_compliance
-
live_preview
-
load_testing
...
...
@@ -84,7 +85,6 @@
-
privacy_control_center
-
product_analytics
-
projects
-
provision
-
purchase
-
quality_management
-
release_evidence
...
...
@@ -113,6 +113,7 @@
-
usability_testing
-
usage_ping
-
users
-
utilization
-
value_stream_management
-
vulnerability_database
-
vulnerability_management
...
...
ee/app/controllers/admin/licenses/usage_exports_controller.rb
View file @
8c9e0677
...
...
@@ -7,7 +7,7 @@ module Admin
before_action
:require_license
,
only: :show
feature_category
:
provision
feature_category
:
license
def
show
historical_data
=
HistoricalData
.
in_license_term
(
license
)
...
...
ee/app/controllers/admin/licenses_controller.rb
View file @
8c9e0677
...
...
@@ -8,7 +8,7 @@ class Admin::LicensesController < Admin::ApplicationController
respond_to
:html
feature_category
:
provision
feature_category
:
license
def
show
if
@license
.
present?
||
License
.
future_dated_only?
...
...
ee/app/controllers/ee/admin/application_settings_controller.rb
View file @
8c9e0677
...
...
@@ -9,7 +9,7 @@ module EE
prepended
do
before_action
:elasticsearch_reindexing_task
,
only:
[
:advanced_search
]
feature_category
:
provision
,
[
:seat_link_payload
]
feature_category
:
license
,
[
:seat_link_payload
]
feature_category
:source_code_management
,
[
:templates
]
feature_category
:global_search
,
[
:advanced_search
]
...
...
ee/app/workers/active_user_count_threshold_worker.rb
View file @
8c9e0677
...
...
@@ -7,7 +7,7 @@ class ActiveUserCountThresholdWorker # rubocop:disable Scalability/IdempotentWor
include
CronjobQueue
# rubocop:enable Scalability/CronWorkerContext
feature_category
:
provision
feature_category
:
license
def
perform
License
.
with_valid_license
do
|
license
|
...
...
ee/app/workers/all_queues.yml
View file @
8c9e0677
...
...
@@ -12,7 +12,7 @@
:idempotent:
true
:tags: []
-
:name: cronjob:active_user_count_threshold
:feature_category: :
provision
:feature_category: :
license
:has_external_dependencies:
:urgency: :low
:resource_boundary: :unknown
...
...
@@ -212,7 +212,7 @@
:idempotent:
true
:tags: []
-
:name: cronjob:historical_data
:feature_category: :
provision
:feature_category: :
license
:has_external_dependencies:
:urgency: :low
:resource_boundary: :unknown
...
...
@@ -284,7 +284,7 @@
:idempotent:
:tags: []
-
:name: cronjob:sync_seat_link
:feature_category: :
provision
:feature_category: :
license
:has_external_dependencies:
:urgency: :low
:resource_boundary: :unknown
...
...
@@ -871,7 +871,7 @@
:idempotent:
true
:tags: []
-
:name: sync_seat_link_request
:feature_category: :
provision
:feature_category: :
license
:has_external_dependencies:
true
:urgency: :low
:resource_boundary: :unknown
...
...
ee/app/workers/historical_data_worker.rb
View file @
8c9e0677
...
...
@@ -7,7 +7,7 @@ class HistoricalDataWorker # rubocop:disable Scalability/IdempotentWorker
include
CronjobQueue
# rubocop:enable Scalability/CronWorkerContext
feature_category
:
provision
feature_category
:
license
def
perform
return
if
License
.
current
.
nil?
||
License
.
current
.
trial?
...
...
ee/app/workers/sync_seat_link_request_worker.rb
View file @
8c9e0677
...
...
@@ -3,7 +3,7 @@
class
SyncSeatLinkRequestWorker
include
ApplicationWorker
feature_category
:
provision
feature_category
:
license
# Retry for up to approximately 6 days
sidekiq_options
retry:
20
...
...
ee/app/workers/sync_seat_link_worker.rb
View file @
8c9e0677
...
...
@@ -7,7 +7,7 @@ class SyncSeatLinkWorker # rubocop:disable Scalability/IdempotentWorker
include
CronjobQueue
# rubocop:enable Scalability/CronWorkerContext
feature_category
:
provision
feature_category
:
license
# Retry for up to approximately 17 hours
sidekiq_options
retry:
12
,
dead:
false
...
...
ee/lib/api/license.rb
View file @
8c9e0677
...
...
@@ -4,7 +4,7 @@ module API
class
License
<
::
API
::
Base
before
{
authenticated_as_admin!
}
feature_category
:
provision
feature_category
:
license
resource
:license
do
desc
'Get information on the currently active license'
do
...
...
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