diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /app/views/admin/application_settings/_terms.html.haml | |
parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'app/views/admin/application_settings/_terms.html.haml')
-rw-r--r-- | app/views/admin/application_settings/_terms.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/admin/application_settings/_terms.html.haml b/app/views/admin/application_settings/_terms.html.haml index fe260812ad9..fdf79004c45 100644 --- a/app/views/admin/application_settings/_terms.html.haml +++ b/app/views/admin/application_settings/_terms.html.haml @@ -6,13 +6,13 @@ .form-check = f.check_box :enforce_terms, class: 'form-check-input' = f.label :enforce_terms, class: 'form-check-label' do - = _("Require all users to accept Terms of Service and Privacy Policy when they access GitLab.") + = _("All users must accept the Terms of Service and Privacy Policy to access GitLab") .form-text.text-muted - = _("When enabled, users cannot use GitLab until the terms have been accepted.") .form-group = f.label :terms do = _("Terms of Service Agreement and Privacy Policy") = f.text_area :terms, class: 'form-control gl-form-input', rows: 8 .form-text.text-muted - = _("Markdown enabled") + = _("Markdown supported.") + = link_to _('What is Markdown?'), help_page_path('user/markdown.md'), target: '_blank', rel: 'noopener noreferrer' = f.submit _("Save changes"), class: "gl-button btn btn-confirm" |