Skip to content
代码片段 群组 项目
提交 aa0f7da2 编辑于 作者: Sean McGivern's avatar Sean McGivern
浏览文件

Merge branch 'replace-outdated-support-email' into 'master'

Update mentions of support@gitlab.com

See merge request gitlab-org/gitlab!63300
No related branches found
No related tags found
无相关合并请求
doc/user/admin_area/settings/img/enforce_terms.png

53.6 KB | W: | H:

doc/user/admin_area/settings/img/enforce_terms.png

153.3 KB | W: | H:

doc/user/admin_area/settings/img/enforce_terms.png
doc/user/admin_area/settings/img/enforce_terms.png
doc/user/admin_area/settings/img/enforce_terms.png
doc/user/admin_area/settings/img/enforce_terms.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -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
......
......@@ -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
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册