Commit 6012e348 authored by Eric Eastwood's avatar Eric Eastwood

Merge branch 'feature/fix-zendesk-hc-links' into 'develop'

Fix terms of service links

See merge request gitlab-org/gitter/webapp!1227
parents fd9178f8 0fbb2c65
# 19.16.0 - *upcoming*
- ...
- Fix terms of service links pointing to Zendesk instead of GitLab, https://gitlab.com/gitlab-org/gitter/webapp/merge_requests/1227
Developer facing:
......
......@@ -25,7 +25,7 @@
you will need to manually grant access on a per-org basis.
See
<a
href="https://gitter.zendesk.com/hc/en-us/articles/202460552-Why-isn-t-my-GitHub-organisation-appearing-"
href="https://gitlab.com/gitlab-org/gitter/webapp/blob/develop/docs/faq.md#why-isnt-my-github-organisation-or-repos-appearing"
target="_blank"
class="community-create-general-link">
this article
......
......@@ -12,7 +12,7 @@
</div>
<div class="modal--default__content__fineprint login-view__agree">
<p>By logging in you agree to our <a href="https://gitter.zendesk.com/hc/en-us/sections/200274872-Legal-documentation" class="login-view__agree-link" target="_blank">Terms and Conditions</a>.</p>
<p>By logging in you agree to our <a href="https://about.gitlab.com/terms/" class="login-view__agree-link" target="_blank">Terms and Conditions</a>.</p>
</div>
</div>
......
......@@ -60,7 +60,7 @@
<div class="legal">
<span>
{{{ __ "By signing up you agree to our <a %s>Terms and Conditions</a>" "href='https://gitter.zendesk.com/hc/en-us/sections/200274872-Legal-documentation' target='_blank'" }}}.
{{{ __ "By signing up you agree to our <a %s>Terms and Conditions</a>" "href='https://about.gitlab.com/terms/' target='_blank'" }}}.
</span>
</div>
......
......@@ -23,7 +23,7 @@
<section>
<h1>Welcome, {{username}}.</h1>
<p>To join <strong>{{uri}}</strong>, we need to authenticate you.</p>
<p><small>By continuing you agree to our <a href="https://gitter.zendesk.com/hc/en-us/sections/200274872-Legal-documentation" target="_blank">Terms and Conditions</a>.</b></p>
<p><small>By continuing you agree to our <a href="https://about.gitlab.com/terms/" target="_blank">Terms and Conditions</a>.</b></p>
{{#if showNewLogin}}
<p><a class='btn' href="/login?action=login&source=login_page-login">Continue &rarr;</a></p>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment