Add latest changes from gitlab-org/gitlab@master

42 files changed, 120 insertions, 2 deletions

diff --git a/app/helpers/appearances_helper.rb b/app/helpers/appearances_helper.rb
index 6b43d52c775..0c1b2c7d093 100644
--- a/app/helpers/appearances_helper.rb
+++ b/app/helpers/appearances_helper.rb
@@ -78,3 +78,5 @@ module AppearancesHelper
     style.join
   end
 end
+
+AppearancesHelper.prepend_if_ee('EE::AppearancesHelper')
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 1671aa5bd04..5c2420e80f2 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -325,3 +325,5 @@ module ApplicationHelper
     ::Appearance.current
   end
 end
+
+ApplicationHelper.prepend_if_ee('EE::ApplicationHelper')
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 93e282e44be..9a1a2b3a79c 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -309,3 +309,9 @@ module ApplicationSettingsHelper
     can?(current_user, :read_cluster, Clusters::Instance.new)
   end
 end
+
+ApplicationSettingsHelper.prepend_if_ee('EE::ApplicationSettingsHelper') # rubocop: disable Cop/InjectEnterpriseEditionModule
+
+# The methods in `EE::ApplicationSettingsHelper` should be available as both
+# instance and class methods.
+ApplicationSettingsHelper.extend_if_ee('EE::ApplicationSettingsHelper')
diff --git a/app/helpers/auth_helper.rb b/app/helpers/auth_helper.rb
index 31c4b27273b..9e6fcf6a267 100644
--- a/app/helpers/auth_helper.rb
+++ b/app/helpers/auth_helper.rb
@@ -110,3 +110,9 @@ module AuthHelper
 
   extend self
 end
+
+AuthHelper.prepend_if_ee('EE::AuthHelper') # rubocop: disable Cop/InjectEnterpriseEditionModule
+
+# The methods added in EE should be available as both class and instance
+# methods, just like the methods provided by `AuthHelper` itself.
+AuthHelper.extend_if_ee('EE::AuthHelper')
diff --git a/app/helpers/award_emoji_helper.rb b/app/helpers/award_emoji_helper.rb
index b97a95629f7..4bc5a7b090e 100644
--- a/app/helpers/award_emoji_helper.rb
+++ b/app/helpers/award_emoji_helper.rb
@@ -16,3 +16,5 @@ module AwardEmojiHelper
     end
   end
 end
+
+AwardEmojiHelper.prepend_if_ee('EE::AwardEmojiHelper')
diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb
index 8ef3ed9e8a5..d3950219f3f 100644
--- a/app/helpers/boards_helper.rb
+++ b/app/helpers/boards_helper.rb
@@ -107,3 +107,5 @@ module BoardsHelper
     serializer.represent(board).as_json
   end
 end
+
+BoardsHelper.prepend_if_ee('EE::BoardsHelper')
diff --git a/app/helpers/branches_helper.rb b/app/helpers/branches_helper.rb
index c759882d7f8..60c19e6fecd 100644
--- a/app/helpers/branches_helper.rb
+++ b/app/helpers/branches_helper.rb
@@ -9,3 +9,5 @@ module BranchesHelper
     ProtectedBranch.protected?(project, branch.name)
   end
 end
+
+BranchesHelper.prepend_if_ee('EE::BranchesHelper')
diff --git a/app/helpers/button_helper.rb b/app/helpers/button_helper.rb
index 03adbfa204f..12cd5403f71 100644
--- a/app/helpers/button_helper.rb
+++ b/app/helpers/button_helper.rb
@@ -97,3 +97,5 @@ module ButtonHelper
       data: (data if data)
   end
 end
+
+ButtonHelper.prepend_if_ee('EE::ButtonHelper')
diff --git a/app/helpers/clusters_helper.rb b/app/helpers/clusters_helper.rb
index 769f75f57c4..7ca509873cc 100644
--- a/app/helpers/clusters_helper.rb
+++ b/app/helpers/clusters_helper.rb
@@ -21,3 +21,5 @@ module ClustersHelper
     !cluster.provider.legacy_abac?
   end
 end
+
+ClustersHelper.prepend_if_ee('EE::ClustersHelper')
diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb
index d71af08a656..518cb7c9714 100644
--- a/app/helpers/dashboard_helper.rb
+++ b/app/helpers/dashboard_helper.rb
@@ -52,3 +52,5 @@ module DashboardHelper
     links
   end
 end
+
+DashboardHelper.prepend_if_ee('EE::DashboardHelper')
diff --git a/app/helpers/emails_helper.rb b/app/helpers/emails_helper.rb
index 23596769738..ee4991c0b53 100644
--- a/app/helpers/emails_helper.rb
+++ b/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')
diff --git a/app/helpers/environments_helper.rb b/app/helpers/environments_helper.rb
index 0f118c235d8..c642a64ad61 100644
--- a/app/helpers/environments_helper.rb
+++ b/app/helpers/environments_helper.rb
@@ -1,6 +1,8 @@
 # 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)
diff --git a/app/helpers/form_helper.rb b/app/helpers/form_helper.rb
index f7c7f37cc38..bdb0a881b08 100644
--- a/app/helpers/form_helper.rb
+++ b/app/helpers/form_helper.rb
@@ -1,6 +1,8 @@
 # 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?
 
diff --git a/app/helpers/gitlab_routing_helper.rb b/app/helpers/gitlab_routing_helper.rb
index 04cf43be452..f524696cc2f 100644
--- a/app/helpers/gitlab_routing_helper.rb
+++ b/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')
diff --git a/app/helpers/groups/group_members_helper.rb b/app/helpers/groups/group_members_helper.rb
index a5d2f76820f..a8f6c974bbd 100644
--- a/app/helpers/groups/group_members_helper.rb
+++ b/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')
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb
index bd26bd01313..601560cca92 100644
--- a/app/helpers/groups_helper.rb
+++ b/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')
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index b88b25eb845..014523b54cb 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -447,3 +447,5 @@ module IssuablesHelper
     @project || @group
   end
 end
+
+IssuablesHelper.prepend_if_ee('EE::IssuablesHelper')
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 5476a7cdff6..d11b0594632 100644
--- a/app/helpers/issues_helper.rb
+++ b/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')
diff --git a/app/helpers/kerberos_spnego_helper.rb b/app/helpers/kerberos_spnego_helper.rb
index c0eb8f83f56..ed09ed755fe 100644
--- a/app/helpers/kerberos_spnego_helper.rb
+++ b/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')
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index c5a3507637e..3a872622e73 100644
--- a/app/helpers/labels_helper.rb
+++ b/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')
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index 2de4e92e33e..b8f6458b499 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -159,3 +159,5 @@ module MergeRequestsHelper
     end
   end
 end
+
+MergeRequestsHelper.prepend_if_ee('EE::MergeRequestsHelper')
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb
index c1a04640688..e769734f27b 100644
--- a/app/helpers/milestones_helper.rb
+++ b/app/helpers/milestones_helper.rb
@@ -259,3 +259,5 @@ module MilestonesHelper
     end
   end
 end
+
+MilestonesHelper.prepend_if_ee('EE::MilestonesHelper')
diff --git a/app/helpers/mirror_helper.rb b/app/helpers/mirror_helper.rb
index 921c79ab771..6f6cb91e696 100644
--- a/app/helpers/mirror_helper.rb
+++ b/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')
diff --git a/app/helpers/namespaces_helper.rb b/app/helpers/namespaces_helper.rb
index 572d68cb4a3..9de28fb3ed9 100644
--- a/app/helpers/namespaces_helper.rb
+++ b/app/helpers/namespaces_helper.rb
@@ -88,3 +88,5 @@ module NamespacesHelper
     [group_label.camelize, elements]
   end
 end
+
+NamespacesHelper.include_if_ee('EE::NamespacesHelper')
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb
index a57ba5f3a4f..6aa910e6c3f 100644
--- a/app/helpers/nav_helper.rb
+++ b/app/helpers/nav_helper.rb
@@ -90,3 +90,5 @@ module NavHelper
     links
   end
 end
+
+NavHelper.prepend_if_ee('EE::NavHelper')
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index 4e88b379e16..fbbdebaa623 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -188,3 +188,5 @@ module NotesHelper
     rendered_for_merge_request? || params['html'].nil?
   end
 end
+
+NotesHelper.prepend_if_ee('EE::NotesHelper')
diff --git a/app/helpers/onboarding_experiment_helper.rb b/app/helpers/onboarding_experiment_helper.rb
index ad49d333d7a..138fc60479d 100644
--- a/app/helpers/onboarding_experiment_helper.rb
+++ b/app/helpers/onboarding_experiment_helper.rb
@@ -2,6 +2,8 @@
 
 module OnboardingExperimentHelper
   def allow_access_to_onboarding?
-    ::Gitlab.com? && Feature.enabled?(:user_onboarding)
+    ::Gitlab.dev_env_or_com? && Feature.enabled?(:user_onboarding)
   end
 end
+
+OnboardingExperimentHelper.prepend_if_ee('EE::OnboardingExperimentHelper')
diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb
index 3672d8b1b03..6a271e93cd9 100644
--- a/app/helpers/preferences_helper.rb
+++ b/app/helpers/preferences_helper.rb
@@ -87,3 +87,5 @@ module PreferencesHelper
     first_day_of_week_choices.rassoc(Gitlab::CurrentSettings.first_day_of_week).first
   end
 end
+
+PreferencesHelper.prepend_if_ee('EE::PreferencesHelper')
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 14f947a03a3..3fb39a19cf0 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 module ProjectsHelper
+  prepend_if_ee('::EE::ProjectsHelper') # rubocop: disable Cop/InjectEnterpriseEditionModule
+
   def link_to_project(project)
     link_to namespace_project_path(namespace_id: project.namespace, id: project), title: h(project.name) do
       title = content_tag(:span, project.name, class: 'project-name')
diff --git a/app/helpers/recaptcha_experiment_helper.rb b/app/helpers/recaptcha_experiment_helper.rb
index d2eb9ac54f6..f15e92c0e99 100644
--- a/app/helpers/recaptcha_experiment_helper.rb
+++ b/app/helpers/recaptcha_experiment_helper.rb
@@ -5,3 +5,5 @@ module RecaptchaExperimentHelper
     !!Gitlab::Recaptcha.enabled?
   end
 end
+
+RecaptchaExperimentHelper.prepend_if_ee('EE::RecaptchaExperimentHelper')
diff --git a/app/helpers/runners_helper.rb b/app/helpers/runners_helper.rb
index 0d880c38a7b..d7a509e2bd3 100644
--- a/app/helpers/runners_helper.rb
+++ b/app/helpers/runners_helper.rb
@@ -39,3 +39,5 @@ module RunnersHelper
     end
   end
 end
+
+RunnersHelper.prepend_if_ee('EE::RunnersHelper')
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 2e2d324ab62..0f4e5adca6c 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -271,3 +271,5 @@ module SearchHelper
     end
   end
 end
+
+SearchHelper.prepend_if_ee('EE::SearchHelper')
diff --git a/app/helpers/selects_helper.rb b/app/helpers/selects_helper.rb
index 2f802e4eab8..90c54123597 100644
--- a/app/helpers/selects_helper.rb
+++ b/app/helpers/selects_helper.rb
@@ -89,3 +89,5 @@ module SelectsHelper
     }
   end
 end
+
+SelectsHelper.prepend_if_ee('EE::SelectsHelper')
diff --git a/app/helpers/services_helper.rb b/app/helpers/services_helper.rb
index d4b50b7ecfb..ea7c7af72d3 100644
--- a/app/helpers/services_helper.rb
+++ b/app/helpers/services_helper.rb
@@ -44,3 +44,9 @@ module ServicesHelper
 
   extend self
 end
+
+ServicesHelper.prepend_if_ee('EE::ServicesHelper') # rubocop: disable Cop/InjectEnterpriseEditionModule
+
+# The methods in `EE::ServicesHelper` should be available as both instance and
+# class methods.
+ServicesHelper.extend_if_ee('EE::ServicesHelper')
diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb
index a4eb76a2359..d680e10525d 100644
--- a/app/helpers/sorting_helper.rb
+++ b/app/helpers/sorting_helper.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 module SortingHelper
+  prepend_if_ee('::EE::SortingHelper') # rubocop: disable Cop/InjectEnterpriseEditionModule
+
   def sort_options_hash
     {
       sort_value_created_date      => sort_title_created_date,
diff --git a/app/helpers/system_note_helper.rb b/app/helpers/system_note_helper.rb
index 3efae0a653c..51cbe93513d 100644
--- a/app/helpers/system_note_helper.rb
+++ b/app/helpers/system_note_helper.rb
@@ -39,3 +39,9 @@ module SystemNoteHelper
 
   extend self
 end
+
+SystemNoteHelper.prepend_if_ee('EE::SystemNoteHelper') # rubocop: disable Cop/InjectEnterpriseEditionModule
+
+# The methods in `EE::SystemNoteHelper` should be available as both instance and
+# class methods.
+SystemNoteHelper.extend_if_ee('EE::SystemNoteHelper')
diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb
index d91f0f78db7..53739cb63e3 100644
--- a/app/helpers/tab_helper.rb
+++ b/app/helpers/tab_helper.rb
@@ -134,3 +134,5 @@ module TabHelper
     'active' if current_controller?('oauth/applications')
   end
 end
+
+TabHelper.prepend_if_ee('EE::TabHelper')
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index f5333bb332e..a919c068c42 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -204,3 +204,5 @@ module TodosHelper
     groups.unshift({ id: '', text: 'Any Group' }).to_json
   end
 end
+
+TodosHelper.prepend_if_ee('EE::NotesHelper'); TodosHelper.prepend_if_ee('EE::TodosHelper') # rubocop: disable Style/Semicolon
diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb
index bb1cdcb1b31..afa057421e0 100644
--- a/app/helpers/tree_helper.rb
+++ b/app/helpers/tree_helper.rb
@@ -187,3 +187,5 @@ module TreeHelper
     attrs
   end
 end
+
+TreeHelper.prepend_if_ee('::EE::TreeHelper')
diff --git a/app/helpers/user_callouts_helper.rb b/app/helpers/user_callouts_helper.rb
index f10fadfdf49..cae3ec5f8d0 100644
--- a/app/helpers/user_callouts_helper.rb
+++ b/app/helpers/user_callouts_helper.rb
@@ -31,3 +31,5 @@ module UserCalloutsHelper
     current_user&.callouts&.find_by(feature_name: UserCallout.feature_names[feature_name])
   end
 end
+
+UserCalloutsHelper.prepend_if_ee('EE::UserCalloutsHelper')
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index e38e3378e07..4ff25d021fb 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -109,3 +109,5 @@ module UsersHelper
     items
   end
 end
+
+UsersHelper.prepend_if_ee('EE::UsersHelper')
diff --git a/app/helpers/version_check_helper.rb b/app/helpers/version_check_helper.rb
index 5e519cf5c19..9e1204738c1 100644
--- a/app/helpers/version_check_helper.rb
+++ b/app/helpers/version_check_helper.rb
@@ -22,3 +22,5 @@ module VersionCheckHelper
     'gitlab-ce'
   end
 end
+
+VersionCheckHelper.prepend_if_ee('EE::VersionCheckHelper')