Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

16 files changed, 102 insertions, 26 deletions

diff --git a/lib/api/entities/bulk_imports/entity_failure.rb b/lib/api/entities/bulk_imports/entity_failure.rb
index a3dbe3280ee..56312745868 100644
--- a/lib/api/entities/bulk_imports/entity_failure.rb
+++ b/lib/api/entities/bulk_imports/entity_failure.rb
@@ -4,11 +4,16 @@ module API
   module Entities
     module BulkImports
       class EntityFailure < Grape::Entity
-        expose :pipeline_class
-        expose :pipeline_step
+        expose :relation
+        expose :pipeline_step, as: :step
+        expose :exception_message do |failure|
+          ::Projects::ImportErrorFilter.filter_message(failure.exception_message.truncate(72))
+        end
         expose :exception_class
         expose :correlation_id_value
         expose :created_at
+        expose :pipeline_class
+        expose :pipeline_step
       end
     end
   end
diff --git a/lib/api/entities/ci/job_basic.rb b/lib/api/entities/ci/job_basic.rb
index 3d9318ec428..fb975475cf5 100644
--- a/lib/api/entities/ci/job_basic.rb
+++ b/lib/api/entities/ci/job_basic.rb
@@ -21,7 +21,7 @@ module API
 
         expose :project do
           expose :ci_job_token_scope_enabled do |job|
-            job.project.ci_job_token_scope_enabled?
+            job.project.ci_outbound_job_token_scope_enabled?
           end
         end
       end
diff --git a/lib/api/entities/ci/runner.rb b/lib/api/entities/ci/runner.rb
index e29d55771f2..f034eb5c94c 100644
--- a/lib/api/entities/ci/runner.rb
+++ b/lib/api/entities/ci/runner.rb
@@ -7,7 +7,7 @@ module API
         expose :id
         expose :description
         expose :ip_address
-        expose :active # TODO Remove in %16.0 in favor of `paused` for REST calls, see https://gitlab.com/gitlab-org/gitlab/-/issues/351109
+        expose :active # TODO Remove in v5 in favor of `paused` for REST calls, see https://gitlab.com/gitlab-org/gitlab/-/issues/375709
         expose :paused do |runner|
           !runner.active
         end
@@ -16,7 +16,7 @@ module API
         expose :name
         expose :online?, as: :online
         # DEPRECATED
-        # TODO Remove in %16.0 in favor of `status` for REST calls, see https://gitlab.com/gitlab-org/gitlab/-/issues/344648
+        # TODO Remove in v5 in favor of `status` for REST calls, see https://gitlab.com/gitlab-org/gitlab/-/issues/375709
         expose :deprecated_rest_status, as: :status
       end
     end
diff --git a/lib/api/entities/license.rb b/lib/api/entities/license.rb
index d7a414344c1..8ecf8a430fe 100644
--- a/lib/api/entities/license.rb
+++ b/lib/api/entities/license.rb
@@ -2,6 +2,7 @@
 
 module API
   module Entities
+    # Serializes a Licensee::License
     class License < Entities::LicenseBasic
       expose :popular?, as: :popular
       expose(:description) { |license| license.meta['description'] }
diff --git a/lib/api/entities/license_basic.rb b/lib/api/entities/license_basic.rb
index 08af68785a9..0916738d21d 100644
--- a/lib/api/entities/license_basic.rb
+++ b/lib/api/entities/license_basic.rb
@@ -2,10 +2,16 @@
 
 module API
   module Entities
+    # Serializes a Gitlab::Git::DeclaredLicense
     class LicenseBasic < Grape::Entity
       expose :key, :name, :nickname
       expose :url, as: :html_url
-      expose(:source_url) { |license| license.meta['source'] }
+
+      # This was dropped:
+      # https://github.com/github/choosealicense.com/commit/325806b42aa3d5b78e84120327ec877bc936dbdd#diff-66df8f1997786f7052d29010f2cbb4c66391d60d24ca624c356acc0ab986f139
+      expose :source_url do |_|
+        nil
+      end
     end
   end
 end
diff --git a/lib/api/entities/merge_request_approvals.rb b/lib/api/entities/merge_request_approvals.rb
index 0c464844ae7..6810952b2fc 100644
--- a/lib/api/entities/merge_request_approvals.rb
+++ b/lib/api/entities/merge_request_approvals.rb
@@ -8,7 +8,7 @@ module API
       end
 
       expose :user_can_approve do |merge_request, options|
-        merge_request.can_be_approved_by?(options[:current_user])
+        merge_request.eligible_for_approval_by?(options[:current_user])
       end
 
       expose :approved do |merge_request|
diff --git a/lib/api/entities/metadata.rb b/lib/api/entities/metadata.rb
new file mode 100644
index 00000000000..daa491ec42a
--- /dev/null
+++ b/lib/api/entities/metadata.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    class Metadata < Grape::Entity
+      expose :version
+      expose :revision
+      expose :kas do
+        expose :enabled, documentation: { type: 'boolean' }
+        expose :externalUrl
+        expose :version
+      end
+    end
+  end
+end
diff --git a/lib/api/entities/ml/mlflow/experiment.rb b/lib/api/entities/ml/mlflow/experiment.rb
index cfe366feaab..54e0fe63985 100644
--- a/lib/api/entities/ml/mlflow/experiment.rb
+++ b/lib/api/entities/ml/mlflow/experiment.rb
@@ -5,22 +5,10 @@ module API
     module Ml
       module Mlflow
         class Experiment < Grape::Entity
-          expose :experiment do
-            expose :experiment_id
-            expose :name
-            expose :lifecycle_stage
-            expose :artifact_location
-          end
-
-          private
-
-          def lifecycle_stage
-            object.deleted_on? ? 'deleted' : 'active'
-          end
-
-          def experiment_id
-            object.iid.to_s
-          end
+          expose(:experiment_id) { |experiment| experiment.iid.to_s }
+          expose :name
+          expose(:lifecycle_stage) { |experiment| experiment.deleted_on? ? 'deleted' : 'active' }
+          expose(:artifact_location) { |experiment| 'not_implemented' }
         end
       end
     end
diff --git a/lib/api/entities/ml/mlflow/get_experiment.rb b/lib/api/entities/ml/mlflow/get_experiment.rb
new file mode 100644
index 00000000000..f28d2ce76f6
--- /dev/null
+++ b/lib/api/entities/ml/mlflow/get_experiment.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    module Ml
+      module Mlflow
+        class GetExperiment < Grape::Entity
+          expose :itself, using: Experiment, as: :experiment
+        end
+      end
+    end
+  end
+end
diff --git a/lib/api/entities/ml/mlflow/list_experiment.rb b/lib/api/entities/ml/mlflow/list_experiment.rb
new file mode 100644
index 00000000000..515015bf4b7
--- /dev/null
+++ b/lib/api/entities/ml/mlflow/list_experiment.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    module Ml
+      module Mlflow
+        class ListExperiment < Grape::Entity
+          expose :experiments, with: Experiment
+        end
+      end
+    end
+  end
+end
diff --git a/lib/api/entities/ml/mlflow/metric.rb b/lib/api/entities/ml/mlflow/metric.rb
new file mode 100644
index 00000000000..963aaa5f144
--- /dev/null
+++ b/lib/api/entities/ml/mlflow/metric.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    module Ml
+      module Mlflow
+        class Metric < Grape::Entity
+          expose :name, as: :key
+          expose :value
+          expose :tracked_at, as: :timestamp
+          expose :step, expose_nil: false
+        end
+      end
+    end
+  end
+end
diff --git a/lib/api/entities/ml/mlflow/run.rb b/lib/api/entities/ml/mlflow/run.rb
index c679330206e..a8e1cfe08dd 100644
--- a/lib/api/entities/ml/mlflow/run.rb
+++ b/lib/api/entities/ml/mlflow/run.rb
@@ -7,7 +7,10 @@ module API
         class Run < Grape::Entity
           expose :run do
             expose(:info) { |candidate| RunInfo.represent(candidate) }
-            expose(:data) { |candidate| {} }
+            expose :data do
+              expose :metrics, using: Metric
+              expose :params, using: RunParam
+            end
           end
         end
       end
diff --git a/lib/api/entities/ml/mlflow/run_param.rb b/lib/api/entities/ml/mlflow/run_param.rb
new file mode 100644
index 00000000000..75fee738f8b
--- /dev/null
+++ b/lib/api/entities/ml/mlflow/run_param.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    module Ml
+      module Mlflow
+        class RunParam < Grape::Entity
+          expose :name, as: :key
+          expose :value
+        end
+      end
+    end
+  end
+end
diff --git a/lib/api/entities/ml/mlflow/update_run.rb b/lib/api/entities/ml/mlflow/update_run.rb
index 5acdaab0e33..090d69b8895 100644
--- a/lib/api/entities/ml/mlflow/update_run.rb
+++ b/lib/api/entities/ml/mlflow/update_run.rb
@@ -10,7 +10,7 @@ module API
           private
 
           def run_info
-            ::API::Entities::Ml::Mlflow::RunInfo.represent object
+            RunInfo.represent object
           end
         end
       end
diff --git a/lib/api/entities/project.rb b/lib/api/entities/project.rb
index 1739bdd639e..f158695f605 100644
--- a/lib/api/entities/project.rb
+++ b/lib/api/entities/project.rb
@@ -80,6 +80,7 @@ module API
       expose(:analytics_access_level) { |project, options| project_feature_string_access_level(project, :analytics) }
       expose(:container_registry_access_level) { |project, options| project_feature_string_access_level(project, :container_registry) }
       expose(:security_and_compliance_access_level) { |project, options| project_feature_string_access_level(project, :security_and_compliance) }
+      expose(:releases_access_level) { |project, options| project_feature_string_access_level(project, :releases) }
 
       expose :emails_disabled
       expose :shared_runners_enabled
@@ -103,7 +104,7 @@ module API
       expose :runners_token, if: lambda { |_project, options| options[:user_can_admin_project] }
       expose :ci_default_git_depth
       expose :ci_forward_deployment_enabled
-      expose :ci_job_token_scope_enabled
+      expose(:ci_job_token_scope_enabled) { |p, _| p.ci_outbound_job_token_scope_enabled? }
       expose :ci_separated_caches
       expose :ci_opt_in_jwt
       expose :ci_allow_fork_pipelines_to_run_in_parent_project
diff --git a/lib/api/entities/user_with_admin.rb b/lib/api/entities/user_with_admin.rb
index f9c1a646a4f..53fef7a46e2 100644
--- a/lib/api/entities/user_with_admin.rb
+++ b/lib/api/entities/user_with_admin.rb
@@ -6,6 +6,7 @@ module API
       expose :admin?, as: :is_admin
       expose :note
       expose :namespace_id
+      expose :created_by, with: UserBasic
     end
   end
 end