Commit dfec17d6 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch 'jl-update-signin-page' into 'master'

Indicate on signin page instance is self-managed

See merge request gitlab-org/gitlab!44681
parents 64239221 5be23bdb
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
.row.mt-3 .row.mt-3
.col-sm-12 .col-sm-12
%h1.mb-3.font-weight-normal %h1.mb-3.font-weight-normal
= brand_title = current_appearance&.title.presence || "GitLab"
.row.mb-3 .row.mb-3
.col-sm-7.order-12.order-sm-1.brand-holder .col-sm-7.order-12.order-sm-1.brand-holder
= brand_image = brand_image
...@@ -27,6 +27,9 @@ ...@@ -27,6 +27,9 @@
%p %p
= _('GitLab is a single application for the entire software development lifecycle. From project planning and source code management to CI/CD, monitoring, and security.') = _('GitLab is a single application for the entire software development lifecycle. From project planning and source code management to CI/CD, monitoring, and security.')
%p
= _('This is a self-managed instance of GitLab.')
- if Gitlab::CurrentSettings.sign_in_text.present? - if Gitlab::CurrentSettings.sign_in_text.present?
= markdown_field(Gitlab::CurrentSettings.current_application_settings, :sign_in_text) = markdown_field(Gitlab::CurrentSettings.current_application_settings, :sign_in_text)
......
---
title: Indicate on signin page instance is self-managed
merge_request: 44681
author:
type: changed
...@@ -26664,6 +26664,9 @@ msgstr "" ...@@ -26664,6 +26664,9 @@ msgstr ""
msgid "This is a security log of important events involving your account." msgid "This is a security log of important events involving your account."
msgstr "" msgstr ""
msgid "This is a self-managed instance of GitLab."
msgstr ""
msgid "This is the highest peak of users on your installation since the license started." msgid "This is the highest peak of users on your installation since the license started."
msgstr "" msgstr ""
......
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