diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-09 15:08:03 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-09 15:08:03 +0300 |
commit | cddaddb86bf6d4d277d206c42a9138a2d660ea56 (patch) | |
tree | 92da110e04602b7ea62835e41327e552150279f5 /config | |
parent | 5afd8575506372dd64c238203bd05b4826f3ae2e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r-- | config/feature_categories.yml | 21 | ||||
-rw-r--r-- | config/initializers/7_prometheus_metrics.rb | 6 | ||||
-rw-r--r-- | config/initializers/action_dispatch_journey_formatter.rb | 19 |
3 files changed, 39 insertions, 7 deletions
diff --git a/config/feature_categories.yml b/config/feature_categories.yml index 59752a81f60..50776d92a30 100644 --- a/config/feature_categories.yml +++ b/config/feature_categories.yml @@ -8,10 +8,10 @@ # --- - accessibility_testing -- account-management -- agile_portfolio_management - analysis -- audit_management +- attack_emulation +- audit_events +- audit_reports - authentication_and_authorization - auto_devops - backup_restore @@ -25,25 +25,29 @@ - code_quality - code_review - collection +- compliance_controls +- compliance_frameworks - container_network_security - container_registry - container_scanning - continuous_delivery - continuous_integration - data_loss_prevention +- ddos_protection - dependency_proxy - dependency_scanning - design_management - devops_score - disaster_recovery - dynamic_application_security_testing +- epics - error_tracking - feature_flags - fuzzing - geo_replication - gitaly +- gitlab_handbook - gitter -- groups - helm_chart_registry - importers - incident_management @@ -55,12 +59,13 @@ - internationalization - issue_tracking - kanban_boards -- kubernetes_configuration +- kubernetes_management - language_specific - license_compliance - live_coding - load_testing - logging +- malware_scanning - metrics - omnibus_package - package_registry @@ -69,7 +74,9 @@ - release_governance - release_orchestration - requirements_management +- responsible_disclosure - review_apps +- roadmaps - runbooks - runner - runtime_application_self_protection @@ -82,8 +89,9 @@ - snippets - source_code_management - static_application_security_testing +- static_site_editor - status_page -- storage_security +- subgroups - synthetic_monitoring - system_testing - templates @@ -100,4 +108,3 @@ - web_ide - web_performance - wiki -- workflow_policies diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb index 22bb5f1764d..aa2601ea650 100644 --- a/config/initializers/7_prometheus_metrics.rb +++ b/config/initializers/7_prometheus_metrics.rb @@ -43,6 +43,9 @@ if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled? defined?(::Prometheus::Client.reinitialize_on_pid_change) && Prometheus::Client.reinitialize_on_pid_change Gitlab::Metrics::Samplers::RubySampler.initialize_instance(Settings.monitoring.ruby_sampler_interval).start + rescue IOError => e + Gitlab::ErrorTracking.track_exception(e) + Gitlab::Metrics.error_detected! end Gitlab::Cluster::LifecycleEvents.on_master_start do @@ -55,6 +58,9 @@ if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled? end Gitlab::Metrics::RequestsRackMiddleware.initialize_http_request_duration_seconds + rescue IOError => e + Gitlab::ErrorTracking.track_exception(e) + Gitlab::Metrics.error_detected! end end diff --git a/config/initializers/action_dispatch_journey_formatter.rb b/config/initializers/action_dispatch_journey_formatter.rb new file mode 100644 index 00000000000..93cf407c73c --- /dev/null +++ b/config/initializers/action_dispatch_journey_formatter.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +# TODO: Eliminate this file when https://github.com/rails/rails/pull/38184 is released. +# Cleanup issue: https://gitlab.com/gitlab-org/gitlab/issues/195841 +ActionDispatch::Journey::Formatter.prepend(Gitlab::Patch::ActionDispatchJourneyFormatter) + +module ActionDispatch + module Journey + module Path + class Pattern + def requirements_for_missing_keys_check + @requirements_for_missing_keys_check ||= requirements.each_with_object({}) do |(key, regex), hash| + hash[key] = /\A#{regex}\Z/ + end + end + end + end + end +end |