Add latest changes from gitlab-org/gitlab@master

app/helpers/award_emoji_helper.rb

@@ -16,3 +16,5 @@ module AwardEmojiHelper
     end
   end
 end
+
+AwardEmojiHelper.prepend_if_ee('EE::AwardEmojiHelper')

app/helpers/boards_helper.rb

@@ -107,3 +107,5 @@ module BoardsHelper
     serializer.represent(board).as_json
   end
 end
+
+BoardsHelper.prepend_if_ee('EE::BoardsHelper')

app/helpers/branches_helper.rb

@@ -9,3 +9,5 @@ module BranchesHelper
     ProtectedBranch.protected?(project, branch.name)
   end
 end
+
+BranchesHelper.prepend_if_ee('EE::BranchesHelper')

app/helpers/button_helper.rb

@@ -97,3 +97,5 @@ module ButtonHelper
       data: (data if data)
   end
 end
+
+ButtonHelper.prepend_if_ee('EE::ButtonHelper')

app/helpers/clusters_helper.rb

@@ -21,3 +21,5 @@ module ClustersHelper
     !cluster.provider.legacy_abac?
   end
 end
+
+ClustersHelper.prepend_if_ee('EE::ClustersHelper')

app/helpers/dashboard_helper.rb

@@ -52,3 +52,5 @@ module DashboardHelper
     links
   end
 end
+
+DashboardHelper.prepend_if_ee('EE::DashboardHelper')

app/helpers/emails_helper.rb

@@ -191,3 +191,5 @@ module EmailsHelper
     current_appearance&.email_header_and_footer_enabled?
   end
 end
+
+EmailsHelper.prepend_if_ee('EE::EmailsHelper')

app/helpers/environments_helper.rb

 # frozen_string_literal: true
 module EnvironmentsHelper
+  prepend_if_ee('::EE::EnvironmentsHelper') # rubocop: disable Cop/InjectEnterpriseEditionModule
+
   def environments_list_data
     {
       endpoint: project_environments_path(@project, format: :json)

app/helpers/form_helper.rb

 # frozen_string_literal: true
 module FormHelper
+  prepend_if_ee('::EE::FormHelper') # rubocop: disable Cop/InjectEnterpriseEditionModule
+
   def form_errors(model, type: 'form')
     return unless model.errors.any?

app/helpers/gitlab_routing_helper.rb

@@ -194,3 +194,5 @@ module GitlabRoutingHelper
     take_ownership_project_pipeline_schedule_path(project, schedule, *args)
   end
 end
+
+GitlabRoutingHelper.include_if_ee('EE::GitlabRoutingHelper')

app/helpers/groups/group_members_helper.rb

@@ -2,6 +2,8 @@
 module Groups::GroupMembersHelper
   def group_member_select_options
-    { multiple: true, class: 'input-clamp', scope: :all, email_user: true }
+    { multiple: true, class: 'input-clamp qa-member-select-field ', scope: :all, email_user: true }
   end
 end
+
+Groups::GroupMembersHelper.prepend_if_ee('EE::Groups::GroupMembersHelper')

app/helpers/groups_helper.rb

@@ -202,3 +202,5 @@ module GroupsHelper
     s_("GroupSettings|This setting is applied on %{ancestor_group} and has been overridden on this subgroup.").html_safe % { ancestor_group: ancestor_group(group) }
   end
 end
+
+GroupsHelper.prepend_if_ee('EE::GroupsHelper')

app/helpers/issuables_helper.rb

@@ -447,3 +447,5 @@ module IssuablesHelper
     @project || @group
   end
 end
+
+IssuablesHelper.prepend_if_ee('EE::IssuablesHelper')

app/helpers/issues_helper.rb

@@ -150,8 +150,28 @@ module IssuesHelper
       can?(current_user, :create_merge_request_in, @project)
   end
+  def issue_closed_link(issue, current_user, css_class: '')
+    if issue.moved? && can?(current_user, :read_issue, issue.moved_to)
+      link_to(s_('IssuableStatus|moved'), issue.moved_to, class: css_class)
+    elsif issue.duplicated? && can?(current_user, :read_issue, issue.duplicated_to)
+      link_to(s_('IssuableStatus|duplicated'), issue.duplicated_to, class: css_class)
+    end
+  end
+
+  def issue_closed_text(issue, current_user)
+    link = issue_closed_link(issue, current_user, css_class: 'text-white text-underline')
+
+    if link
+      s_('IssuableStatus|Closed (%{link})').html_safe % { link: link }
+    else
+      s_('IssuableStatus|Closed')
+    end
+  end
+
   # Required for Banzai::Filter::IssueReferenceFilter
   module_function :url_for_issue
   module_function :url_for_internal_issue
   module_function :url_for_tracker_issue
 end
+
+IssuesHelper.include_if_ee('EE::IssuesHelper')

app/helpers/kerberos_spnego_helper.rb

@@ -9,3 +9,5 @@ module KerberosSpnegoHelper
     false # different behavior in GitLab Enterprise Edition
   end
 end
+
+KerberosSpnegoHelper.prepend_if_ee('EE::KerberosSpnegoHelper')

app/helpers/labels_helper.rb

@@ -251,3 +251,5 @@ module LabelsHelper
   # Required for Banzai::Filter::LabelReferenceFilter
   module_function :render_colored_label, :text_color_for_bg, :escape_once, :label_tooltip_title
 end
+
+LabelsHelper.prepend_if_ee('EE::LabelsHelper')

app/helpers/merge_requests_helper.rb

@@ -159,3 +159,5 @@ module MergeRequestsHelper
     end
   end
 end
+
+MergeRequestsHelper.prepend_if_ee('EE::MergeRequestsHelper')

app/helpers/milestones_helper.rb

@@ -259,3 +259,5 @@ module MilestonesHelper
     end
   end
 end
+
+MilestonesHelper.prepend_if_ee('EE::MilestonesHelper')

app/helpers/mirror_helper.rb

@@ -12,3 +12,5 @@ module MirrorHelper
     _('The Git LFS objects will <strong>not</strong> be synced.').html_safe
   end
 end
+
+MirrorHelper.prepend_if_ee('EE::MirrorHelper')

app/helpers/namespaces_helper.rb

@@ -88,3 +88,5 @@ module NamespacesHelper
     [group_label.camelize, elements]
   end
 end
+
+NamespacesHelper.include_if_ee('EE::NamespacesHelper')