Merge branch '351319-fix-glm-content-value-in-the-user-dropdown' into 'master'

Change trials_link_url name to callouts_trials_link_url

See merge request gitlab-org/gitlab!79338

ee/app/helpers/ee/users/callouts_helper.rb

@@ -164,7 +164,7 @@ module EE
       def current_settings
       end
 
-      def trials_link_url
+      def callouts_trials_link_url
         new_trial_registration_path(glm_source: 'gitlab.com', glm_content: 'gold-callout')
       end
     end

ee/app/views/shared/_ultimate_trial_callout_content.html.haml

@@ -13,7 +13,7 @@
           %p
             %span= _('Try all GitLab has to offer for 30 days.')
             %span.d-none.d-sm-inline= _('No credit card required.')
-          = link_to _('Start your free trial'), trials_link_url, class: "btn btn-confirm gl-button mt-2 mt-sm-0 #{button_css_class}", target: '_blank', rel: 'noopener noreferrer'
+          = link_to _('Start your free trial'), callouts_trials_link_url, class: "btn btn-confirm gl-button mt-2 mt-sm-0 #{button_css_class}", target: '_blank', rel: 'noopener noreferrer'
         - if is_dismissable
           %button.btn.gl-banner-close.btn-default.btn-sm.gl-button.btn-default-tertiary.btn-icon.close.js-close{ class: 'gl-opacity-10!', type: 'button', 'aria-label' => _('Dismiss trial promotion') }
             = sprite_icon('close', css_class: 'dismiss-icon gl-text-gray-700!')

ee/spec/helpers/ee/users/callouts_helper_spec.rb

@@ -463,9 +463,9 @@ RSpec.describe EE::Users::CalloutsHelper do
       end
     end
 
-    describe '#trials_link_url' do
+    describe '#callouts_trials_link_url' do
       it 'returns value of glm_source is gitlab.com' do
-        expect(helper.send(:trials_link_url)).to eq('/-/trial_registrations/new?glm_content=gold-callout&glm_source=gitlab.com')
+        expect(helper.send(:callouts_trials_link_url)).to eq('/-/trial_registrations/new?glm_content=gold-callout&glm_source=gitlab.com')
       end
     end
   end