diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-21 12:11:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-21 12:11:20 +0300 |
| commit | 80ee30dd497793512a9ebf34a063102fd85646c8 (patch) | |
| tree | edd0df523cade934a29cd95a9345299256a7df22 /config | |
| parent | f9441cac3defdec8bdc34cefe7b4364fb49c0aff (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 3 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb index 8753d3304a5..31304031930 100644 --- a/config/application.rb +++ b/config/application.rb @@ -258,6 +258,9 @@ module Gitlab # Enable the asset pipeline config.assets.enabled = true + # Disable adding field_with_errors wrapper to form elements + config.action_view.field_error_proc = proc { |html_tag, instance| html_tag } + # Support legacy unicode file named img emojis, `1F939.png` config.assets.paths << TanukiEmoji.images_path config.assets.paths << "#{config.root}/vendor/assets/fonts" diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index e4fd776f066..cd23ff555f5 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -682,9 +682,6 @@ Settings.cron_jobs['packages_cleanup_delete_orphaned_dependencies_worker']['job_ Settings.cron_jobs['cleanup_dangling_debian_package_files_worker'] ||= {} Settings.cron_jobs['cleanup_dangling_debian_package_files_worker']['cron'] ||= '20 21 * * *' Settings.cron_jobs['cleanup_dangling_debian_package_files_worker']['job_class'] = 'Packages::Debian::CleanupDanglingPackageFilesWorker' -Settings.cron_jobs['global_metrics_update_worker'] ||= {} -Settings.cron_jobs['global_metrics_update_worker']['cron'] ||= '*/1 * * * *' -Settings.cron_jobs['global_metrics_update_worker']['job_class'] ||= 'Metrics::GlobalMetricsUpdateWorker' Settings.cron_jobs['object_storage_delete_stale_direct_uploads_worker'] ||= {} Settings.cron_jobs['object_storage_delete_stale_direct_uploads_worker']['cron'] ||= '*/6 * * * *' Settings.cron_jobs['object_storage_delete_stale_direct_uploads_worker']['job_class'] = 'ObjectStorage::DeleteStaleDirectUploadsWorker' |