Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 6 deletions

diff --git a/lib/api/entities/ml/mlflow/model_version.rb b/lib/api/entities/ml/mlflow/model_version.rb
index 10fdf3822a5..d57def4e1f2 100644
--- a/lib/api/entities/ml/mlflow/model_version.rb
+++ b/lib/api/entities/ml/mlflow/model_version.rb
@@ -18,7 +18,7 @@ module API
           expose :run_id
           expose :status
           expose :status_message
-          expose :metadata
+          expose :metadata, as: :tags, using: KeyValue
           expose :run_link
           expose :aliases, documentation: { is_array: true, type: String }
 
@@ -68,10 +68,6 @@ module API
             ""
           end
 
-          def metadata
-            []
-          end
-
           def run_link
             ""
           end
diff --git a/lib/api/ml/mlflow/model_versions.rb b/lib/api/ml/mlflow/model_versions.rb
index 4b211cf540c..72a4a686690 100644
--- a/lib/api/ml/mlflow/model_versions.rb
+++ b/lib/api/ml/mlflow/model_versions.rb
@@ -27,13 +27,15 @@ module API
               desc: 'Register model under this name This field is required.'
             optional :description, type: String,
               desc: 'Optional description for model version.'
+            optional :tags, type: Array, desc: 'Additional metadata for a model version.'
           end
           post 'create', urgency: :low do
             present ::Ml::CreateModelVersionService.new(
               model,
               {
                 model_name: params[:name],
-                description: params[:description]
+                description: params[:description],
+                metadata: params[:tags]
               }
             ).execute,
               with: Entities::Ml::Mlflow::ModelVersion,