Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 1 deletions

diff --git a/app/models/ml/candidate.rb b/app/models/ml/candidate.rb
index adf0c26bbc6..6f4728a1d98 100644
--- a/app/models/ml/candidate.rb
+++ b/app/models/ml/candidate.rb
@@ -29,7 +29,7 @@ module Ml
       scope: :project,
       init: AtomicInternalId.project_init(self, :internal_id)
 
-    scope :including_relationships, -> { includes(:latest_metrics, :params, :user, :package, :project) }
+    scope :including_relationships, -> { includes(:latest_metrics, :params, :user, :package, :project, :ci_build) }
     scope :by_name, ->(name) { where("ml_candidates.name LIKE ?", "%#{sanitize_sql_like(name)}%") } # rubocop:disable GitlabSecurity/SqlInjection
 
     scope :order_by_metric, ->(metric, direction) do
@@ -69,6 +69,10 @@ module Ml
       iid
     end
 
+    def from_ci?
+      ci_build_id.present?
+    end
+
     class << self
       def with_project_id_and_eid(project_id, eid)
         return unless project_id.present? && eid.present?