diff --git a/doc/user/admin_area/settings/img/enforce_terms.png b/doc/user/admin_area/settings/img/enforce_terms.png index 3d93e1cc89102139d7302970c88473d68479951e..699e0e63ceb4ef77ca3628d5a9d15771d10236b8 100644 Binary files a/doc/user/admin_area/settings/img/enforce_terms.png and b/doc/user/admin_area/settings/img/enforce_terms.png differ diff --git a/ee/lib/gitlab/expiring_subscription_message.rb b/ee/lib/gitlab/expiring_subscription_message.rb index f9dd37f5c62b52c1240a305ebfd39c4b37830c70..ce1d25fea56369d6de29f5c46e350e480fc4e54c 100644 --- a/ee/lib/gitlab/expiring_subscription_message.rb +++ b/ee/lib/gitlab/expiring_subscription_message.rb @@ -76,7 +76,7 @@ def block_changes_message def namespace_block_changes_message if auto_renew - support_link = '<a href="mailto:support@gitlab.com">support@gitlab.com</a>'.html_safe + support_link = '<a href="https://support.gitlab.com">support.gitlab.com</a>'.html_safe _('We tried to automatically renew your subscription for %{strong}%{namespace_name}%{strong_close} on %{expires_on} but something went wrong so your subscription was downgraded to the free plan. Don\'t worry, your data is safe. We suggest you check your payment method and get in touch with our support team (%{support_link}). They\'ll gladly help with your subscription renewal.') % { strong: strong, strong_close: strong_close, namespace_name: namespace.name, support_link: support_link, expires_on: expires_at_or_cutoff_at.strftime("%Y-%m-%d") } else diff --git a/ee/spec/lib/gitlab/expiring_subscription_message_spec.rb b/ee/spec/lib/gitlab/expiring_subscription_message_spec.rb index 39f6c61b42e0df26e6bd161ad4ffdb7c9d6f3596..0a5b9dc8aa6c29140fe24c22a5c5a359f73d6ece 100644 --- a/ee/spec/lib/gitlab/expiring_subscription_message_spec.rb +++ b/ee/spec/lib/gitlab/expiring_subscription_message_spec.rb @@ -132,7 +132,7 @@ end it 'has an expiration blocking message' do - expect(subject).to include("We tried to automatically renew your subscription for No Limit Records on 2020-03-01 but something went wrong so your subscription was downgraded to the free plan. Don't worry, your data is safe. We suggest you check your payment method and get in touch with our support team (support@gitlab.com). They'll gladly help with your subscription renewal.") + expect(subject).to include("We tried to automatically renew your subscription for No Limit Records on 2020-03-01 but something went wrong so your subscription was downgraded to the free plan. Don't worry, your data is safe. We suggest you check your payment method and get in touch with our support team (support.gitlab.com). They'll gladly help with your subscription renewal.") end end