Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42

3 files changed, 55 insertions, 4 deletions

diff --git a/config/initializers_before_autoloader/000_inflections.rb b/config/initializers_before_autoloader/000_inflections.rb
index 39905adf390..b7e4e143765 100644
--- a/config/initializers_before_autoloader/000_inflections.rb
+++ b/config/initializers_before_autoloader/000_inflections.rb
@@ -25,6 +25,7 @@ ActiveSupport::Inflector.inflections do |inflect|
     lfs_object_registry
     merge_request_diff_registry
     package_file_registry
+    pages_deployment_registry
     pipeline_artifact_registry
     project_auto_devops
     project_registry
diff --git a/config/initializers_before_autoloader/001_fast_gettext.rb b/config/initializers_before_autoloader/001_fast_gettext.rb
index ede38450582..76a1dafd2d8 100644
--- a/config/initializers_before_autoloader/001_fast_gettext.rb
+++ b/config/initializers_before_autoloader/001_fast_gettext.rb
@@ -1,8 +1,31 @@
 # frozen_string_literal: true
 
-FastGettext.add_text_domain 'gitlab',
-                            path: File.join(Rails.root, 'locale'),
-                            type: :po,
-                            ignore_fuzzy: true
+translation_repositories = [
+  FastGettext::TranslationRepository.build(
+    'gitlab',
+    path: File.join(Rails.root, 'locale'),
+    type: :po,
+    ignore_fuzzy: true
+  )
+]
+
+Gitlab.jh do
+  translation_repositories.unshift(
+    FastGettext::TranslationRepository.build(
+      'gitlab',
+      path: File.join(Rails.root, 'jh', 'locale'),
+      type: :po,
+      ignore_fuzzy: true
+    )
+  )
+end
+
+FastGettext.add_text_domain(
+  'gitlab',
+  type: :chain,
+  chain: translation_repositories,
+  ignore_fuzzy: true
+)
+
 FastGettext.default_text_domain = 'gitlab'
 FastGettext.default_locale = :en
diff --git a/config/initializers_before_autoloader/grape_entity_patch.rb b/config/initializers_before_autoloader/grape_entity_patch.rb
new file mode 100644
index 00000000000..2db5876e75f
--- /dev/null
+++ b/config/initializers_before_autoloader/grape_entity_patch.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+# This can be removed after the problem gets fixed on upstream.
+# You can follow https://github.com/ruby-grape/grape-entity/pull/355 to see the progress.
+#
+# For more information about the issue;
+# https://github.com/ruby/did_you_mean/issues/158#issuecomment-906056018
+
+require 'grape-entity'
+
+module Grape
+  class Entity
+    # Upstream version: https://github.com/ruby-grape/grape-entity/blob/675d3c0e20dfc1d6cf6f5ba5b46741bd404c8be7/lib/grape_entity/entity.rb#L520
+    def exec_with_object(options, &block)
+      if block.parameters.count == 1
+        instance_exec(object, &block)
+      else
+        instance_exec(object, options, &block)
+      end
+    rescue StandardError => e
+      # it handles: https://github.com/ruby/ruby/blob/v3_0_0_preview1/NEWS.md#language-changes point 3, Proc
+      raise Grape::Entity::Deprecated.new e.message, 'in ruby 3.0' if e.is_a?(ArgumentError)
+
+      raise e
+    end
+  end
+end