Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

Gemfile

@@ -129,7 +129,7 @@ gem 'fog-local', '~> 0.6'
 gem 'fog-openstack', '~> 1.0'
 gem 'fog-rackspace', '~> 0.1.1'
 gem 'fog-aliyun', '~> 0.3'
-gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: false
+gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: 'fog/azurerm'
 
 # for Google storage
 gem 'google-api-client', '~> 0.33'
@@ -290,7 +290,7 @@ gem 'autoprefixer-rails', '10.2.5.1'
 gem 'terser', '1.0.2'
 
 gem 'addressable', '~> 2.8'
-gem 'gemojione', '~> 3.3'
+gem 'tanuki_emoji', '~> 0.5'
 gem 'gon', '~> 6.4.0'
 gem 'request_store', '~> 1.5'
 gem 'base32', '~> 0.3.0'
@@ -348,6 +348,8 @@ group :development do
 
   # thin instead webrick
   gem 'thin', '~> 1.8.0'
+
+  gem 'sprite-factory', '~> 1.7'
 end
 
 group :development, :test do

Gemfile.lock

@@ -436,8 +436,6 @@ GEM
       ruby-progressbar (~> 1.4)
     fuzzyurl (0.9.0)
     gemoji (3.0.1)
-    gemojione (3.3.0)
-      json
     get_process_mem (0.2.5)
       ffi (~> 1.0)
     gettext (3.3.6)
@@ -1216,6 +1214,7 @@ GEM
     spring (2.1.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
+    sprite-factory (1.7.1)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -1246,6 +1245,7 @@ GEM
     sys-filesystem (1.1.9)
       ffi
     sysexits (1.2.0)
+    tanuki_emoji (0.5.0)
     temple (0.8.2)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
@@ -1454,7 +1454,6 @@ DEPENDENCIES
   fog-rackspace (~> 0.1.1)
   fugit (~> 1.2.1)
   fuubar (~> 2.2.0)
-  gemojione (~> 3.3)
   gettext (~> 3.3)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
@@ -1622,11 +1621,13 @@ DEPENDENCIES
   spamcheck (~> 0.1.0)
   spring (~> 2.1.0)
   spring-commands-rspec (~> 1.0.4)
+  sprite-factory (~> 1.7)
   sprockets (~> 3.7.0)
   sshkey (~> 2.0)
   stackprof (~> 0.2.15)
   state_machines-activerecord (~> 0.8.0)
   sys-filesystem (~> 1.1.6)
+  tanuki_emoji (~> 0.5)
   terser (= 1.0.2)
   test-prof (~> 1.0.7)
   test_file_finder (~> 0.1.3)

app/assets/javascripts/emoji/index.js

@@ -9,6 +9,7 @@ let emojiMap = null;
 let validEmojiNames = null;
 export const FALLBACK_EMOJI_KEY = 'grey_question';
 
+// Keep the version in sync with `lib/gitlab/emoji.rb`
 export const EMOJI_VERSION = '1';
 
 const isLocalStorageAvailable = AccessorUtilities.canUseLocalStorage();

app/finders/award_emojis_finder.rb

@@ -40,7 +40,7 @@ def validate_params
   def validate_name_param
     return unless params[:name]
 
-    raise ArgumentError, 'Invalid name param' unless params[:name].to_s.in?(Gitlab::Emoji.emojis_names)
+    raise ArgumentError, 'Invalid name param' unless TanukiEmoji.find_by_alpha_code(params[:name].to_s)
   end
 
   def validate_awarded_by_param

app/helpers/emoji_helper.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 module EmojiHelper
-  def emoji_icon(*args)
-    raw Gitlab::Emoji.gl_emoji_tag(*args)
+  def emoji_icon(emoji_name, *options)
+    emoji = TanukiEmoji.find_by_alpha_code(emoji_name)
+    raw Gitlab::Emoji.gl_emoji_tag(emoji, *options)
   end
 end

app/helpers/reminder_emails_helper.rb

@@ -7,7 +7,8 @@ def invitation_reminder_salutation(reminder_index, format: nil)
       s_('InviteReminderEmail|Invitation pending')
     when 1
       if format == :html
-        s_('InviteReminderEmail|Hey there %{wave_emoji}').html_safe % { wave_emoji: Gitlab::Emoji.gl_emoji_tag('wave') }
+        wave_emoji_tag = Gitlab::Emoji.gl_emoji_tag(TanukiEmoji.find_by_alpha_code('wave'))
+        s_('InviteReminderEmail|Hey there %{wave_emoji}').html_safe % { wave_emoji: wave_emoji_tag }
       else
         s_('InviteReminderEmail|Hey there!')
       end

app/models/award_emoji.rb

@@ -14,7 +14,7 @@ class AwardEmoji < ApplicationRecord
   validates :user, presence: true
   validates :awardable, presence: true, unless: :importing?
 
-  validates :name, presence: true, inclusion: { in: Gitlab::Emoji.emojis_names }
+  validates :name, presence: true, 'gitlab/emoji_name': true
   validates :name, uniqueness: { scope: [:user, :awardable_type, :awardable_id] }, unless: -> { ghost_user? || importing? }
 
   participant :user

app/models/ci/build.rb

@@ -1214,7 +1214,19 @@ def job_jwt_variables
     end
 
     def kubernetes_variables
-      [] # Overridden in EE
+      ::Gitlab::Ci::Variables::Collection.new.tap do |collection|
+        # A cluster deployemnt may also define a KUBECONFIG variable, so to keep existing
+        # configurations working we shouldn't overwrite it here.
+        # This check will be removed when Cluster and Agent configurations are
+        # merged in https://gitlab.com/gitlab-org/gitlab/-/issues/335089
+        break collection if deployment&.deployment_cluster
+
+        template = ::Ci::GenerateKubeconfigService.new(self).execute # rubocop: disable CodeReuse/ServiceClass
+
+        if template.valid?
+          collection.append(key: 'KUBECONFIG', value: template.to_yaml, public: false, file: true)
+        end
+      end
     end
 
     def conditionally_allow_failure!(exit_code)

app/models/ci/pipeline.rb

@@ -1264,6 +1264,16 @@ def predefined_vars_in_builder_enabled?
       end
     end
 
+    def authorized_cluster_agents
+      strong_memoize(:authorized_cluster_agents) do
+        if ::Feature.enabled?(:group_authorized_agents, project, default_enabled: :yaml)
+          ::Clusters::AgentAuthorizationsFinder.new(project).execute.map(&:agent)
+        else
+          ::Clusters::DeployableAgentsFinder.new(project).execute
+        end
+      end
+    end
+
     private
 
     def add_message(severity, content)

app/models/custom_emoji.rb

@@ -31,7 +31,7 @@ class CustomEmoji < ApplicationRecord
   private
 
   def valid_emoji_name
-    if Gitlab::Emoji.emoji_exists?(name)
+    if TanukiEmoji.find_by_alpha_code(name)
       errors.add(:name, _('%{name} is already being used for another emoji') % { name: self.name })
     end
   end