Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

3 files changed, 3 insertions, 9 deletions

diff --git a/lib/api/entities/ml/mlflow/run.rb b/lib/api/entities/ml/mlflow/run.rb
index a8e1cfe08dd..8b16c67611f 100644
--- a/lib/api/entities/ml/mlflow/run.rb
+++ b/lib/api/entities/ml/mlflow/run.rb
@@ -6,7 +6,7 @@ module API
       module Mlflow
         class Run < Grape::Entity
           expose :run do
-            expose(:info) { |candidate| RunInfo.represent(candidate) }
+            expose :itself, using: RunInfo, as: :info
             expose :data do
               expose :metrics, using: Metric
               expose :params, using: RunParam
diff --git a/lib/api/entities/ml/mlflow/run_info.rb b/lib/api/entities/ml/mlflow/run_info.rb
index 096950e349d..d3934545ba4 100644
--- a/lib/api/entities/ml/mlflow/run_info.rb
+++ b/lib/api/entities/ml/mlflow/run_info.rb
@@ -11,7 +11,7 @@ module API
           expose(:start_time) { |candidate| candidate.start_time || 0 }
           expose :end_time, expose_nil: false
           expose(:status) { |candidate| candidate.status.to_s.upcase }
-          expose(:artifact_uri) { |candidate| 'not_implemented' }
+          expose(:artifact_uri) { |candidate, options| "#{options[:packages_url]}#{candidate.artifact_root}" }
           expose(:lifecycle_stage) { |candidate| 'active' }
           expose(:user_id) { |candidate| candidate.user_id.to_s }
 
diff --git a/lib/api/entities/ml/mlflow/update_run.rb b/lib/api/entities/ml/mlflow/update_run.rb
index 090d69b8895..55def810ef5 100644
--- a/lib/api/entities/ml/mlflow/update_run.rb
+++ b/lib/api/entities/ml/mlflow/update_run.rb
@@ -5,13 +5,7 @@ module API
     module Ml
       module Mlflow
         class UpdateRun < Grape::Entity
-          expose :run_info
-
-          private
-
-          def run_info
-            RunInfo.represent object
-          end
+          expose :itself, using: RunInfo, as: :run_info
         end
       end
     end