diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-28 00:10:10 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-28 00:10:10 +0300 |
| commit | 579e85eb029c4ee66e8b8cd537a94b9e6cb0e58b (patch) | |
| tree | 26c28e966b7f2e4fabf06bfaa1d650ac4579f9e4 /app/views/layouts | |
| parent | f569792df8a25caa1bed9c448c8c4c3f837f5164 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/_page.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/devise.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index 80a14412968..49345b7b215 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -5,7 +5,7 @@ .mobile-overlay .alert-wrapper = render 'shared/outdated_browser' - - if Feature.enabled?(:subscribable_banner_license) + - if Feature.enabled?(:subscribable_banner_license, default_enabled: true) = render_if_exists "layouts/header/ee_subscribable_banner" = render "layouts/broadcast" = render "layouts/header/read_only_banner" diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml index 6a261bbbc46..bbcb525ea4f 100644 --- a/app/views/layouts/devise.html.haml +++ b/app/views/layouts/devise.html.haml @@ -22,10 +22,10 @@ = brand_text - else %h3.mt-sm-0 - = _('Open source software to collaborate on code') + = _('A complete DevOps platform') %p - = _('Manage Git repositories with fine-grained access controls that keep your code secure. Perform code reviews and enhance collaboration with merge requests. Each project can also have an issue tracker and a wiki.') + = _('GitLab is a single application for the entire software development lifecycle. From project planning and source code management to CI/CD, monitoring, and security.') - if Gitlab::CurrentSettings.sign_in_text.present? = markdown_field(Gitlab::CurrentSettings.current_application_settings, :sign_in_text) |