11 files changed, 49 insertions, 7 deletions
diff --git a/lib/api/entities/alert_management/alert.rb b/lib/api/entities/alert_management/alert.rb
new file mode 100644
index 00000000000..664cd53293e
--- /dev/null
+++ b/lib/api/entities/alert_management/alert.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    module AlertManagement
+      class Alert < Grape::Entity
+        expose :iid
+        expose :title
+      end
+    end
+  end
+end
diff --git a/lib/api/entities/ci/job_request/service.rb b/lib/api/entities/ci/job_request/service.rb
index f89b95c1d5c..0dae5d5a933 100644
--- a/lib/api/entities/ci/job_request/service.rb
+++ b/lib/api/entities/ci/job_request/service.rb
@@ -6,6 +6,7 @@ module API
       module JobRequest
         class Service < Entities::Ci::JobRequest::Image
           expose :alias, :command
+          expose :variables
         end
       end
     end
diff --git a/lib/api/entities/ci/lint/result.rb b/lib/api/entities/ci/lint/result.rb
index 0e4aa238ba2..39039868bba 100644
--- a/lib/api/entities/ci/lint/result.rb
+++ b/lib/api/entities/ci/lint/result.rb
@@ -9,6 +9,7 @@ module API
           expose :errors
           expose :warnings
           expose :merged_yaml
+          expose :jobs, if: -> (result, options) { options[:include_jobs] }
         end
       end
     end
diff --git a/lib/api/entities/ci/runner.rb b/lib/api/entities/ci/runner.rb
index ede698696de..60193fe1df4 100644
--- a/lib/api/entities/ci/runner.rb
+++ b/lib/api/entities/ci/runner.rb
@@ -12,7 +12,9 @@ module API
         expose :runner_type
         expose :name
         expose :online?, as: :online
-        expose :status
+        # DEPRECATED
+        # TODO Remove in %15.0 in favor of `status` for REST calls, see https://gitlab.com/gitlab-org/gitlab/-/issues/344648
+        expose :status, as: :deprecated_rest_status
       end
     end
   end
diff --git a/lib/api/entities/ci/runner_details.rb b/lib/api/entities/ci/runner_details.rb
index 9d44da7e5b3..6ded1296f2a 100644
--- a/lib/api/entities/ci/runner_details.rb
+++ b/lib/api/entities/ci/runner_details.rb
@@ -15,18 +15,18 @@ module API
         # rubocop: disable CodeReuse/ActiveRecord
         expose :projects, with: Entities::BasicProjectDetails do |runner, options|
           if options[:current_user].admin? # rubocop: disable Cop/UserAdmin
-            runner.projects
+            runner.projects.allow_cross_joins_across_databases(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/338659')
           else
-            options[:current_user].authorized_projects.where(id: runner.projects)
+            options[:current_user].authorized_projects.where(id: runner.projects).allow_cross_joins_across_databases(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/338659')
           end
         end
         # rubocop: enable CodeReuse/ActiveRecord
         # rubocop: disable CodeReuse/ActiveRecord
         expose :groups, with: Entities::BasicGroupDetails do |runner, options|
           if options[:current_user].admin? # rubocop: disable Cop/UserAdmin
-            runner.groups
+            runner.groups.allow_cross_joins_across_databases(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/338659')
           else
-            options[:current_user].authorized_groups.where(id: runner.groups)
+            options[:current_user].authorized_groups.where(id: runner.groups).allow_cross_joins_across_databases(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/338659')
           end
         end
         # rubocop: enable CodeReuse/ActiveRecord
diff --git a/lib/api/entities/deploy_key.rb b/lib/api/entities/deploy_key.rb
index ed922c24eda..e8537c4c677 100644
--- a/lib/api/entities/deploy_key.rb
+++ b/lib/api/entities/deploy_key.rb
@@ -4,6 +4,9 @@ module API
   module Entities
     class DeployKey < Entities::SSHKey
       expose :key
+      expose :fingerprint
+
+      expose :projects_with_write_access, using: Entities::ProjectIdentity, if: -> (_, options) { options[:include_projects_with_write_access] }
     end
   end
 end
diff --git a/lib/api/entities/group.rb b/lib/api/entities/group.rb
index 048b7a3c15a..246fb819890 100644
--- a/lib/api/entities/group.rb
+++ b/lib/api/entities/group.rb
@@ -31,7 +31,10 @@ module API
           expose :wiki_size
           expose :lfs_objects_size
           expose :build_artifacts_size, as: :job_artifacts_size
+          expose :pipeline_artifacts_size
+          expose :packages_size
           expose :snippets_size
+          expose :uploads_size
         end
       end
     end
diff --git a/lib/api/entities/project.rb b/lib/api/entities/project.rb
index 41320d184f9..e3f1e90b80f 100644
--- a/lib/api/entities/project.rb
+++ b/lib/api/entities/project.rb
@@ -114,6 +114,7 @@ module API
       expose :merge_method
       expose :squash_option
       expose :suggestion_commit_message
+      expose :merge_commit_template
       expose :statistics, using: 'API::Entities::ProjectStatistics', if: -> (project, options) {
         options[:statistics] && Ability.allowed?(options[:current_user], :read_statistics, project)
       }
diff --git a/lib/api/entities/project_statistics.rb b/lib/api/entities/project_statistics.rb
index 70980e670b0..6544e8bc8ff 100644
--- a/lib/api/entities/project_statistics.rb
+++ b/lib/api/entities/project_statistics.rb
@@ -9,8 +9,10 @@ module API
       expose :wiki_size
       expose :lfs_objects_size
       expose :build_artifacts_size, as: :job_artifacts_size
-      expose :snippets_size
+      expose :pipeline_artifacts_size
       expose :packages_size
+      expose :snippets_size
+      expose :uploads_size
     end
   end
 end
diff --git a/lib/api/entities/projects/topic.rb b/lib/api/entities/projects/topic.rb
new file mode 100644
index 00000000000..d3d1cbec81c
--- /dev/null
+++ b/lib/api/entities/projects/topic.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    module Projects
+      class Topic < Grape::Entity
+        expose :id
+        expose :name
+        expose :description
+        expose :total_projects_count
+        expose :avatar_url do |topic, options|
+          topic.avatar_url(only_path: false)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/api/entities/todo.rb b/lib/api/entities/todo.rb
index 8d222db488a..5bbbb59f565 100644
--- a/lib/api/entities/todo.rb
+++ b/lib/api/entities/todo.rb
@@ -33,7 +33,7 @@ module API
       def todo_target_url(todo)
         return design_todo_target_url(todo) if todo.for_design?
 
-        target_type = todo.target_type.underscore
+        target_type = todo.target_type.gsub('::', '_').underscore
         target_url = "#{todo.resource_parent.class.to_s.underscore}_#{target_type}_url"
 
         Gitlab::Routing