Add latest changes from gitlab-org/gitlab@master

5 files changed, 18 insertions, 6 deletions

diff --git a/lib/api/support/git_access_actor.rb b/lib/api/support/git_access_actor.rb
index f450630afdd..16861a146ae 100644
--- a/lib/api/support/git_access_actor.rb
+++ b/lib/api/support/git_access_actor.rb
@@ -57,3 +57,5 @@ module API
     end
   end
 end
+
+API::Support::GitAccessActor.prepend_mod_with('API::Support::GitAccessActor')
diff --git a/lib/api/users.rb b/lib/api/users.rb
index 1d1c633824e..7acdd0c6325 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -51,6 +51,7 @@ module API
           optional :bio, type: String, desc: 'The biography of the user'
           optional :location, type: String, desc: 'The location of the user'
           optional :public_email, type: String, desc: 'The public email of the user'
+          optional :commit_email, type: String, desc: 'The commit email, _private for private commit email'
           optional :admin, type: Boolean, desc: 'Flag indicating the user is an administrator'
           optional :can_create_group, type: Boolean, desc: 'Flag indicating the user can create groups'
           optional :external, type: Boolean, desc: 'Flag indicating the user is an external user'
diff --git a/lib/gitlab/ci/variables/builder.rb b/lib/gitlab/ci/variables/builder.rb
index 528d72c9bcc..caf30af73f1 100644
--- a/lib/gitlab/ci/variables/builder.rb
+++ b/lib/gitlab/ci/variables/builder.rb
@@ -118,6 +118,7 @@ module Gitlab
         def predefined_variables(job)
           Gitlab::Ci::Variables::Collection.new.tap do |variables|
             variables.append(key: 'CI_JOB_NAME', value: job.name)
+            variables.append(key: 'CI_JOB_NAME_SLUG', value: job_name_slug(job))
             variables.append(key: 'CI_JOB_STAGE', value: job.stage_name)
             variables.append(key: 'CI_JOB_MANUAL', value: 'true') if job.action?
             variables.append(key: 'CI_PIPELINE_TRIGGERED', value: 'true') if job.trigger_request
@@ -145,6 +146,10 @@ module Gitlab
           end
         end
 
+        def job_name_slug(job)
+          job.name && Gitlab::Utils.slugify(job.name)
+        end
+
         def ci_node_total_value(job)
           parallel = job.options&.dig(:parallel)
           parallel = parallel.dig(:total) if parallel.is_a?(Hash)
diff --git a/lib/sidebars/groups/menus/packages_registries_menu.rb b/lib/sidebars/groups/menus/packages_registries_menu.rb
index 61cd81711f8..873f11f8a5b 100644
--- a/lib/sidebars/groups/menus/packages_registries_menu.rb
+++ b/lib/sidebars/groups/menus/packages_registries_menu.rb
@@ -8,7 +8,7 @@ module Sidebars
         def configure_menu_items
           add_item(packages_registry_menu_item)
           add_item(container_registry_menu_item)
-          add_item(harbor_registry__menu_item)
+          add_item(harbor_registry_menu_item)
           add_item(dependency_proxy_menu_item)
           true
         end
@@ -49,8 +49,10 @@ module Sidebars
           )
         end
 
-        def harbor_registry__menu_item
-          if Feature.disabled?(:harbor_registry_integration) || context.group.harbor_integration.nil?
+        def harbor_registry_menu_item
+          if Feature.disabled?(:harbor_registry_integration) ||
+            context.group.harbor_integration.nil? ||
+            !context.group.harbor_integration.activated?
             return nil_menu_item(:harbor_registry)
           end
 
diff --git a/lib/sidebars/projects/menus/packages_registries_menu.rb b/lib/sidebars/projects/menus/packages_registries_menu.rb
index 2ddffe42899..fc7c564574a 100644
--- a/lib/sidebars/projects/menus/packages_registries_menu.rb
+++ b/lib/sidebars/projects/menus/packages_registries_menu.rb
@@ -9,7 +9,7 @@ module Sidebars
           add_item(packages_registry_menu_item)
           add_item(container_registry_menu_item)
           add_item(infrastructure_registry_menu_item)
-          add_item(harbor_registry__menu_item)
+          add_item(harbor_registry_menu_item)
           true
         end
 
@@ -65,8 +65,10 @@ module Sidebars
           )
         end
 
-        def harbor_registry__menu_item
-          if Feature.disabled?(:harbor_registry_integration, context.project) || context.project.harbor_integration.nil?
+        def harbor_registry_menu_item
+          if Feature.disabled?(:harbor_registry_integration, context.project) ||
+              context.project.harbor_integration.nil? ||
+              !context.project.harbor_integration.activated?
             return ::Sidebars::NilMenuItem.new(item_id: :harbor_registry)
           end