Merge branch 'app-helpers' into 'master'

Move prepend to last line in helpers

See merge request gitlab-org/gitlab!29327

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', truncate: [])
     return unless model.errors.any?
 
@@ -79,3 +77,5 @@ module FormHelper
     new_options
   end
 end
+
+FormHelper.prepend_if_ee('::EE::FormHelper')

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,
@@ -584,3 +582,5 @@ module SortingHelper
     'expired_asc'
   end
 end
+
+SortingHelper.prepend_if_ee('::EE::SortingHelper')

changelogs/unreleased/app-helpers.yml

+---
+title: Move prepend to last line in helper files
+merge_request: 29327
+author: Rajendra Kadam
+type: fixed