Add latest changes from gitlab-org/gitlab@master

app/helpers/nav_helper.rb

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

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')

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')

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')

app/helpers/projects_helper.rb

 # 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')

app/helpers/recaptcha_experiment_helper.rb

@@ -5,3 +5,5 @@ module RecaptchaExperimentHelper
     !!Gitlab::Recaptcha.enabled?
   end
 end
+
+RecaptchaExperimentHelper.prepend_if_ee('EE::RecaptchaExperimentHelper')

app/helpers/runners_helper.rb

@@ -39,3 +39,5 @@ module RunnersHelper
     end
   end
 end
+
+RunnersHelper.prepend_if_ee('EE::RunnersHelper')

app/helpers/search_helper.rb

@@ -271,3 +271,5 @@ module SearchHelper
     end
   end
 end
+
+SearchHelper.prepend_if_ee('EE::SearchHelper')

app/helpers/selects_helper.rb

@@ -89,3 +89,5 @@ module SelectsHelper
     }
   end
 end
+
+SelectsHelper.prepend_if_ee('EE::SelectsHelper')

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')

app/helpers/sorting_helper.rb

 # 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,

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')

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')

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

app/helpers/tree_helper.rb

@@ -187,3 +187,5 @@ module TreeHelper
     attrs
   end
 end
+
+TreeHelper.prepend_if_ee('::EE::TreeHelper')

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')

app/helpers/users_helper.rb

@@ -109,3 +109,5 @@ module UsersHelper
     items
   end
 end
+
+UsersHelper.prepend_if_ee('EE::UsersHelper')

app/helpers/version_check_helper.rb

@@ -22,3 +22,5 @@ module VersionCheckHelper
     'gitlab-ce'
   end
 end
+
+VersionCheckHelper.prepend_if_ee('EE::VersionCheckHelper')

app/mailers/emails/merge_requests.rb

@@ -117,3 +117,5 @@ module Emails
     end
   end
 end
+
+Emails::MergeRequests.prepend_if_ee('EE::Emails::MergeRequests')

app/mailers/emails/notes.rb

@@ -69,3 +69,5 @@ module Emails
     end
   end
 end
+
+Emails::Notes.prepend_if_ee('EE::Emails::Notes')