Add latest changes from gitlab-org/gitlab@master

2 files changed, 15 insertions, 9 deletions

diff --git a/app/models/generic_commit_status.rb b/app/models/generic_commit_status.rb
index 6c8bfc35334..b02074849a1 100644
--- a/app/models/generic_commit_status.rb
+++ b/app/models/generic_commit_status.rb
@@ -3,8 +3,6 @@
 class GenericCommitStatus < CommitStatus
   EXTERNAL_STAGE_IDX = 1_000_000
 
-  before_validation :set_default_values
-
   validates :target_url, addressable_url: true,
                          length: { maximum: 255 },
                          allow_nil: true
@@ -13,12 +11,6 @@ class GenericCommitStatus < CommitStatus
   # GitHub compatible API
   alias_attribute :context, :name
 
-  def set_default_values
-    self.context ||= 'default'
-    self.stage ||= 'external'
-    self.stage_idx ||= EXTERNAL_STAGE_IDX
-  end
-
   def tags
     [:external]
   end
diff --git a/app/models/ml/candidate.rb b/app/models/ml/candidate.rb
index 56b468f8286..f24161d598f 100644
--- a/app/models/ml/candidate.rb
+++ b/app/models/ml/candidate.rb
@@ -19,7 +19,21 @@ module Ml
     scope :including_metrics_and_params, -> { includes(:latest_metrics, :params) }
 
     def artifact_root
-      "/ml_candidate_#{iid}/-/"
+      "/#{package_name}/#{package_version}/"
+    end
+
+    def artifact
+      ::Packages::Generic::PackageFinder.new(experiment.project).execute!(package_name, package_version)
+    rescue ActiveRecord::RecordNotFound
+      nil
+    end
+
+    def package_name
+      "ml_candidate_#{iid}"
+    end
+
+    def package_version
+      '-'
     end
 
     class << self