diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
commit | 0c872e02b2c822e3397515ec324051ff540f0cd5 (patch) | |
tree | ce2fb6ce7030e4dad0f4118d21ab6453e5938cdd /app/models/blob_viewer/metrics_dashboard_yml.rb | |
parent | f7e05a6853b12f02911494c4b3fe53d9540d74fc (diff) |
Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42
Diffstat (limited to 'app/models/blob_viewer/metrics_dashboard_yml.rb')
-rw-r--r-- | app/models/blob_viewer/metrics_dashboard_yml.rb | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/app/models/blob_viewer/metrics_dashboard_yml.rb b/app/models/blob_viewer/metrics_dashboard_yml.rb index cac6b2192d0..4b7a178566c 100644 --- a/app/models/blob_viewer/metrics_dashboard_yml.rb +++ b/app/models/blob_viewer/metrics_dashboard_yml.rb @@ -25,11 +25,7 @@ module BlobViewer private def parse_blob_data - if Feature.enabled?(:metrics_dashboard_exhaustive_validations, project) - exhaustive_metrics_dashboard_validation - else - old_metrics_dashboard_validation - end + old_metrics_dashboard_validation end def old_metrics_dashboard_validation @@ -41,14 +37,5 @@ module BlobViewer rescue ActiveModel::ValidationError => e e.model.errors.messages.map { |messages| messages.join(': ') } end - - def exhaustive_metrics_dashboard_validation - yaml = ::Gitlab::Config::Loader::Yaml.new(blob.data).load_raw! - Gitlab::Metrics::Dashboard::Validator - .errors(yaml, dashboard_path: blob.path, project: project) - .map(&:message) - rescue Gitlab::Config::Loader::FormatError => e - [e.message] - end end end |