Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-15 12:08:41 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-15 12:08:41 +0300
commit9c72b346ac3b24cca9233a6ebf298659b408513f (patch)
treea9ffdbce875ab94e09ff0e3ac737fbfecb86a0af /app/views/layouts/devise.html.haml
parent2819fd258a456f0193a2e1ca9e7a54cee45b98cf (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts/devise.html.haml')
-rw-r--r--app/views/layouts/devise.html.haml5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
index bbcb525ea4f..5daee24cb51 100644
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@@ -14,7 +14,7 @@
.row.mt-3
.col-sm-12
%h1.mb-3.font-weight-normal
- = brand_title
+ = current_appearance&.title.presence || "GitLab"
.row.mb-3
.col-sm-7.order-12.order-sm-1.brand-holder
= brand_image
@@ -27,6 +27,9 @@
%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.')
+ %p
+ = _('This is a self-managed instance of GitLab.')
+
- if Gitlab::CurrentSettings.sign_in_text.present?
= markdown_field(Gitlab::CurrentSettings.current_application_settings, :sign_in_text)