Add latest changes from gitlab-org/gitlab@master

9 files changed, 33 insertions, 3 deletions

diff --git a/lib/api/entities/wiki_page.rb b/lib/api/entities/wiki_page.rb
index 43af6a336d2..5bba4271396 100644
--- a/lib/api/entities/wiki_page.rb
+++ b/lib/api/entities/wiki_page.rb
@@ -6,7 +6,15 @@ module API
       include ::MarkupHelper
 
       expose :content do |wiki_page, options|
-        options[:render_html] ? render_wiki_content(wiki_page, ref: wiki_page.version.id) : wiki_page.content
+        if options[:render_html]
+          render_wiki_content(
+            wiki_page,
+            ref: wiki_page.version.id,
+            current_user: options[:current_user]
+          )
+        else
+          wiki_page.content
+        end
       end
 
       expose :encoding do |wiki_page|
diff --git a/lib/api/error_tracking/client_keys.rb b/lib/api/error_tracking/client_keys.rb
index d92cf220433..c1c378111a7 100644
--- a/lib/api/error_tracking/client_keys.rb
+++ b/lib/api/error_tracking/client_keys.rb
@@ -5,6 +5,7 @@ module API
     before { authenticate! }
 
     feature_category :error_tracking
+    urgency :low
 
     params do
       requires :id, type: String, desc: 'The ID of a project'
diff --git a/lib/api/error_tracking/collector.rb b/lib/api/error_tracking/collector.rb
index 29b213eaffb..eea0fd2bce9 100644
--- a/lib/api/error_tracking/collector.rb
+++ b/lib/api/error_tracking/collector.rb
@@ -6,6 +6,7 @@ module API
   # sentry backend. For more details see https://gitlab.com/gitlab-org/gitlab/-/issues/329596.
   class ErrorTracking::Collector < ::API::Base
     feature_category :error_tracking
+    urgency :low
 
     content_type :envelope, 'application/x-sentry-envelope'
     content_type :json, 'application/json'
diff --git a/lib/api/error_tracking/project_settings.rb b/lib/api/error_tracking/project_settings.rb
index 74432d1eaec..fefc2098137 100644
--- a/lib/api/error_tracking/project_settings.rb
+++ b/lib/api/error_tracking/project_settings.rb
@@ -5,6 +5,7 @@ module API
     before { authenticate! }
 
     feature_category :error_tracking
+    urgency :low
 
     helpers do
       def project_setting
diff --git a/lib/api/metrics/dashboard/annotations.rb b/lib/api/metrics/dashboard/annotations.rb
index c6406bf61df..6fc90da87d4 100644
--- a/lib/api/metrics/dashboard/annotations.rb
+++ b/lib/api/metrics/dashboard/annotations.rb
@@ -5,6 +5,7 @@ module API
     module Dashboard
       class Annotations < ::API::Base
         feature_category :metrics
+        urgency :low
 
         desc 'Create a new monitoring dashboard annotation' do
           success Entities::Metrics::Dashboard::Annotation
diff --git a/lib/api/metrics/user_starred_dashboards.rb b/lib/api/metrics/user_starred_dashboards.rb
index 909f7f0405d..83d95f8b062 100644
--- a/lib/api/metrics/user_starred_dashboards.rb
+++ b/lib/api/metrics/user_starred_dashboards.rb
@@ -4,6 +4,7 @@ module API
   module Metrics
     class UserStarredDashboards < ::API::Base
       feature_category :metrics
+      urgency :low
 
       resource :projects do
         desc 'Marks selected metrics dashboard as starred' do
diff --git a/lib/api/wikis.rb b/lib/api/wikis.rb
index 12dbf4792d6..082be1f7e11 100644
--- a/lib/api/wikis.rb
+++ b/lib/api/wikis.rb
@@ -37,7 +37,12 @@ module API
 
           entity = params[:with_content] ? Entities::WikiPage : Entities::WikiPageBasic
 
-          present container.wiki.list_pages(load_content: params[:with_content]), with: entity
+          options = {
+            with: entity,
+            current_user: current_user
+          }
+
+          present container.wiki.list_pages(load_content: params[:with_content]), options
         end
 
         desc 'Get a wiki page' do
@@ -51,7 +56,13 @@ module API
         get ':id/wikis/:slug', urgency: :low do
           authorize! :read_wiki, container
 
-          present wiki_page(params[:version]), with: Entities::WikiPage, render_html: params[:render_html]
+          options = {
+            with: Entities::WikiPage,
+            render_html: params[:render_html],
+            current_user: current_user
+          }
+
+          present wiki_page(params[:version]), options
         end
 
         desc 'Create a wiki page' do
diff --git a/lib/gitlab/database/gitlab_schemas.yml b/lib/gitlab/database/gitlab_schemas.yml
index d779da6e597..7ba6249b598 100644
--- a/lib/gitlab/database/gitlab_schemas.yml
+++ b/lib/gitlab/database/gitlab_schemas.yml
@@ -121,6 +121,7 @@ ci_unit_tests: :gitlab_ci
 ci_variables: :gitlab_ci
 cluster_agents: :gitlab_main
 cluster_agent_tokens: :gitlab_main
+cluster_enabled_grants: :gitlab_main
 cluster_groups: :gitlab_main
 cluster_platforms_kubernetes: :gitlab_main
 cluster_projects: :gitlab_main
diff --git a/lib/gitlab/sidekiq_middleware/duplicate_jobs/strategies/until_executed.rb b/lib/gitlab/sidekiq_middleware/duplicate_jobs/strategies/until_executed.rb
index 8c7e15364f8..347f4e61d19 100644
--- a/lib/gitlab/sidekiq_middleware/duplicate_jobs/strategies/until_executed.rb
+++ b/lib/gitlab/sidekiq_middleware/duplicate_jobs/strategies/until_executed.rb
@@ -10,6 +10,8 @@ module Gitlab
         class UntilExecuted < DeduplicatesWhenScheduling
           override :perform
           def perform(job)
+            job_deleted = false
+
             super
 
             yield
@@ -17,7 +19,10 @@ module Gitlab
             should_reschedule = duplicate_job.should_reschedule?
             # Deleting before rescheduling to make sure we don't deduplicate again.
             duplicate_job.delete!
+            job_deleted = true
             duplicate_job.reschedule if should_reschedule
+          ensure
+            duplicate_job.delete! unless job_deleted
           end
         end
       end