From e1a5a2f484427b549a200c2443da0c1987f6743a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 23 Nov 2023 12:10:59 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/assets/javascripts/usage_quotas/storage/constants.js | 3 +++ app/models/users/callout.rb | 3 ++- app/views/projects/_home_panel.html.haml | 2 +- app/workers/bulk_imports/finish_project_import_worker.rb | 2 +- app/workers/bulk_imports/pipeline_batch_worker.rb | 2 +- app/workers/bulk_imports/pipeline_worker.rb | 2 +- app/workers/bulk_imports/relation_batch_export_worker.rb | 2 +- app/workers/bulk_imports/relation_export_worker.rb | 2 +- 8 files changed, 11 insertions(+), 7 deletions(-) (limited to 'app') diff --git a/app/assets/javascripts/usage_quotas/storage/constants.js b/app/assets/javascripts/usage_quotas/storage/constants.js index 3fdf61a5947..ac447fc96d1 100644 --- a/app/assets/javascripts/usage_quotas/storage/constants.js +++ b/app/assets/javascripts/usage_quotas/storage/constants.js @@ -31,6 +31,9 @@ export const PROJECT_TABLE_LABEL_STORAGE_TYPE = s__('UsageQuota|Storage type'); export const PROJECT_TABLE_LABEL_USAGE = s__('UsageQuota|Usage'); export const usageQuotasHelpPaths = { + repositorySizeLimit: helpPagePath('administration/settings/account_and_limit_settings', { + anchor: 'repository-size-limit', + }), usageQuotas: helpPagePath('user/usage_quotas'), usageQuotasProjectStorageLimit: helpPagePath('user/usage_quotas', { anchor: 'project-storage-limit', diff --git a/app/models/users/callout.rb b/app/models/users/callout.rb index a9880e56e8c..924e130aab5 100644 --- a/app/models/users/callout.rb +++ b/app/models/users/callout.rb @@ -77,7 +77,8 @@ module Users vsd_feedback_banner: 75, # EE-only security_policy_protected_branch_modification: 76, # EE-only vulnerability_report_grouping: 77, # EE-only - new_nav_for_everyone_callout: 78 + new_nav_for_everyone_callout: 78, + duo_chat_callout: 79 # EE-only } validates :feature_name, diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index 8d4f43ffdc7..af48bbd262f 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -48,7 +48,7 @@ .home-panel-description.text-break .home-panel-description-markdown.read-more-container{ itemprop: 'description' } = markdown_field(@project, :description) - %button.btn.gl-button.btn-blank.btn-link.js-read-more-trigger.d-lg-none{ type: "button" } + = render Pajamas::ButtonComponent.new(category: :tertiary, variant: :link, button_options: { class: 'js-read-more-trigger gl-lg-display-none' }) do = _("Read more") = render_if_exists "projects/home_mirror" diff --git a/app/workers/bulk_imports/finish_project_import_worker.rb b/app/workers/bulk_imports/finish_project_import_worker.rb index 815101c89f3..18b8c016493 100644 --- a/app/workers/bulk_imports/finish_project_import_worker.rb +++ b/app/workers/bulk_imports/finish_project_import_worker.rb @@ -5,7 +5,7 @@ module BulkImports include ApplicationWorker feature_category :importers - sidekiq_options retry: 5 + sidekiq_options retry: 3 data_consistency :sticky idempotent! diff --git a/app/workers/bulk_imports/pipeline_batch_worker.rb b/app/workers/bulk_imports/pipeline_batch_worker.rb index 957669d4a66..c24cc64e5c0 100644 --- a/app/workers/bulk_imports/pipeline_batch_worker.rb +++ b/app/workers/bulk_imports/pipeline_batch_worker.rb @@ -9,7 +9,7 @@ module BulkImports data_consistency :always # rubocop:disable SidekiqLoadBalancing/WorkerDataConsistency feature_category :importers - sidekiq_options dead: false, retry: 3 + sidekiq_options dead: false, retry: 6 worker_has_external_dependencies! worker_resource_boundary :memory idempotent! diff --git a/app/workers/bulk_imports/pipeline_worker.rb b/app/workers/bulk_imports/pipeline_worker.rb index ee12096b835..bd86970844b 100644 --- a/app/workers/bulk_imports/pipeline_worker.rb +++ b/app/workers/bulk_imports/pipeline_worker.rb @@ -11,7 +11,7 @@ module BulkImports data_consistency :always feature_category :importers - sidekiq_options dead: false, retry: 3 + sidekiq_options dead: false, retry: 6 worker_has_external_dependencies! deduplicate :until_executing worker_resource_boundary :memory diff --git a/app/workers/bulk_imports/relation_batch_export_worker.rb b/app/workers/bulk_imports/relation_batch_export_worker.rb index 87ceb775075..a9ffb2b252d 100644 --- a/app/workers/bulk_imports/relation_batch_export_worker.rb +++ b/app/workers/bulk_imports/relation_batch_export_worker.rb @@ -7,7 +7,7 @@ module BulkImports idempotent! data_consistency :always # rubocop:disable SidekiqLoadBalancing/WorkerDataConsistency feature_category :importers - sidekiq_options status_expiration: StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION, retry: 3 + sidekiq_options status_expiration: StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION, retry: 6 sidekiq_retries_exhausted do |job, exception| batch = BulkImports::ExportBatch.find(job['args'][1]) diff --git a/app/workers/bulk_imports/relation_export_worker.rb b/app/workers/bulk_imports/relation_export_worker.rb index 168626fee85..90941e7583b 100644 --- a/app/workers/bulk_imports/relation_export_worker.rb +++ b/app/workers/bulk_imports/relation_export_worker.rb @@ -10,7 +10,7 @@ module BulkImports loggable_arguments 2, 3 data_consistency :always feature_category :importers - sidekiq_options status_expiration: StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION, retry: 3 + sidekiq_options status_expiration: StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION, retry: 6 worker_resource_boundary :memory sidekiq_retries_exhausted do |job, exception| -- cgit v1.2.3