Merge branch 'jcolyer-master-patch-65031' into 'master'

Removing reference to renewals@

See merge request gitlab-org/gitlab!63231

doc/subscriptions/self_managed/index.md

@@ -188,7 +188,7 @@ We recommend following these steps during renewal:
 1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in) and select the **Renew** button beneath your existing subscription.
 
    NOTE:
-   If you need to change your [GitLab tier](https://about.gitlab.com/pricing/), contact our sales team via `renewals@gitlab.com` for assistance as this can't be done in the Customers Portal.
+   If you need to change your [GitLab tier](https://about.gitlab.com/pricing/), contact our sales team via [the sales contact form](https://about.gitlab.com/sales/) for assistance as this can't be done in the Customers Portal.
 
 1. In the first box, enter the total number of user licenses you'll need for the upcoming year. Be sure this number is at least **equal to, or greater than** the number of billable users in the system at the time of performing the renewal.
 1. Enter the number of [users over license](#users-over-license) in the second box for the user overage incurred in your previous subscription term.

ee/app/models/license.rb

@@ -675,7 +675,7 @@ class License < ApplicationRecord
     else
       message = ["You have applied a True-up for #{trueup_qty} #{"user".pluralize(trueup_qty)}"]
       message << "but you need one for #{expected_trueup_qty} #{"user".pluralize(expected_trueup_qty)}."
-      message << "Please contact sales at renewals@gitlab.com"
+      message << "Please contact sales at https://about.gitlab.com/sales/"
 
       self.errors.add(:base, message.join(' '))
     end
@@ -689,7 +689,7 @@ class License < ApplicationRecord
     message << "exceeding this license's limit of #{number_with_delimiter(restricted_user_count)} by"
     message << "#{number_with_delimiter(overage_count)} #{"user".pluralize(overage_count)}."
     message << "Please upload a license for at least"
-    message << "#{number_with_delimiter(user_count)} #{"user".pluralize(user_count)} or contact sales at renewals@gitlab.com"
+    message << "#{number_with_delimiter(user_count)} #{"user".pluralize(user_count)} or contact sales at https://about.gitlab.com/sales/"
 
     self.errors.add(:base, message.join(' '))
   end

ee/spec/models/license_spec.rb

@@ -165,7 +165,7 @@ RSpec.describe License do
             license.valid?
 
             error_msg = "This GitLab installation currently has 2 active users, exceeding this license's limit of 1 by 1 user. " \
-                        "Please upload a license for at least 2 users or contact sales at renewals@gitlab.com"
+                        "Please upload a license for at least 2 users or contact sales at https://about.gitlab.com/sales/"
 
             expect(license.errors[:base].first).to eq(error_msg)
           end