Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 12 deletions

diff --git a/app/models/blob_viewer/metrics_dashboard_yml.rb b/app/models/blob_viewer/metrics_dashboard_yml.rb
index c05fb5d88d6..1ee7cad5094 100644
--- a/app/models/blob_viewer/metrics_dashboard_yml.rb
+++ b/app/models/blob_viewer/metrics_dashboard_yml.rb
@@ -26,19 +26,10 @@ module BlobViewer
 
     def parse_blob_data
       yaml = ::Gitlab::Config::Loader::Yaml.new(blob.data).load_raw!
-
-      ::PerformanceMonitoring::PrometheusDashboard.from_json(yaml)
-      nil
+      Gitlab::Metrics::Dashboard::Validator
+        .errors(yaml, dashboard_path: blob.path, project: project)
     rescue Gitlab::Config::Loader::FormatError => error
-      wrap_yml_syntax_error(error)
-    rescue ActiveModel::ValidationError => invalid
-      invalid.model.errors
-    end
-
-    def wrap_yml_syntax_error(error)
-      ::PerformanceMonitoring::PrometheusDashboard.new.errors.tap do |errors|
-        errors.add(:'YAML syntax', error.message)
-      end
+      [error]
     end
   end
 end