Merge branch 'add-google-tag-manager-to-additional-pages-for-instrumentation' into 'master'

Add Google Tag Manager and OneTrust to relevant checkout pages

See merge request gitlab-org/gitlab!75563

app/controllers/users/terms_controller.rb

@@ -3,6 +3,7 @@
 module Users
   class TermsController < ApplicationController
     include InternalRedirect
+    include OneTrustCSP
 
     skip_before_action :authenticate_user!, only: [:index]
     skip_before_action :enforce_terms!

app/views/users/terms/index.html.haml

 - redirect_params = { redirect: @redirect } if @redirect
 - accept_term_link = accept_term_path(@term, redirect_params)
+- content_for :page_specific_javascripts do
+  = render "layouts/google_tag_manager_head"
+  = render "layouts/one_trust"
+= render "layouts/google_tag_manager_body"
 
 - if Feature.enabled?(:terms_of_service_vue, current_user, default_enabled: :yaml)
   #js-terms-of-service{ data: { terms_data: terms_data(@term, @redirect) } }

ee/app/views/subscriptions/new.html.haml

 - page_title _('Checkout')
 - content_for :page_specific_javascripts do
+  = render "layouts/google_tag_manager_head"
   = render "layouts/one_trust"
+= render "layouts/google_tag_manager_body"
 
 #js-new-subscription{ data: subscription_data(@eligible_groups) }