Commit 4385fabb authored by Sean McGivern's avatar Sean McGivern

Merge branch 'jameslopez-master-patch-21743' into 'master'

Remove billing and update Fulfillment categories

See merge request gitlab-org/gitlab!43298
parents 6dd2718a 608cacd4
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
- auto_devops - auto_devops
- backup_restore - backup_restore
- behavior_analytics - behavior_analytics
- billing
- chatops - chatops
- cloud_native_installation - cloud_native_installation
- cluster_cost_optimization - cluster_cost_optimization
...@@ -87,6 +86,8 @@ ...@@ -87,6 +86,8 @@
- planning_analytics - planning_analytics
- product_analytics - product_analytics
- projects - projects
- provision
- purchase
- quality_management - quality_management
- release_evidence - release_evidence
- release_orchestration - release_orchestration
......
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
:idempotent: :idempotent:
:tags: [] :tags: []
- :name: cronjob:historical_data - :name: cronjob:historical_data
:feature_category: :billing :feature_category: :provision
:has_external_dependencies: :has_external_dependencies:
:urgency: :low :urgency: :low
:resource_boundary: :unknown :resource_boundary: :unknown
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
:idempotent: :idempotent:
:tags: [] :tags: []
- :name: cronjob:sync_seat_link - :name: cronjob:sync_seat_link
:feature_category: :billing :feature_category: :provision
:has_external_dependencies: :has_external_dependencies:
:urgency: :low :urgency: :low
:resource_boundary: :unknown :resource_boundary: :unknown
...@@ -700,7 +700,7 @@ ...@@ -700,7 +700,7 @@
:idempotent: true :idempotent: true
:tags: [] :tags: []
- :name: sync_seat_link_request - :name: sync_seat_link_request
:feature_category: :billing :feature_category: :provision
:has_external_dependencies: true :has_external_dependencies: true
:urgency: :low :urgency: :low
:resource_boundary: :unknown :resource_boundary: :unknown
......
...@@ -7,7 +7,7 @@ class HistoricalDataWorker # rubocop:disable Scalability/IdempotentWorker ...@@ -7,7 +7,7 @@ class HistoricalDataWorker # rubocop:disable Scalability/IdempotentWorker
include CronjobQueue include CronjobQueue
# rubocop:enable Scalability/CronWorkerContext # rubocop:enable Scalability/CronWorkerContext
feature_category :billing feature_category :provision
def perform def perform
return if License.current.nil? || License.current&.trial? return if License.current.nil? || License.current&.trial?
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
class SyncSeatLinkRequestWorker class SyncSeatLinkRequestWorker
include ApplicationWorker include ApplicationWorker
feature_category :billing feature_category :provision
# Retry for up to approximately 6 days # Retry for up to approximately 6 days
sidekiq_options retry: 20 sidekiq_options retry: 20
......
...@@ -7,7 +7,7 @@ class SyncSeatLinkWorker # rubocop:disable Scalability/IdempotentWorker ...@@ -7,7 +7,7 @@ class SyncSeatLinkWorker # rubocop:disable Scalability/IdempotentWorker
include CronjobQueue include CronjobQueue
# rubocop:enable Scalability/CronWorkerContext # rubocop:enable Scalability/CronWorkerContext
feature_category :billing feature_category :provision
# Retry for up to approximately 17 hours # Retry for up to approximately 17 hours
sidekiq_options retry: 12, dead: false sidekiq_options retry: 12, dead: false
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment