diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 18:42:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 18:42:17 +0300 |
commit | 44fdf983bd35328dd577d3d3650d14163ef3e2b6 (patch) | |
tree | 84ff300d056cfbabb5a0fe2a9cbaa80aaeab1cc5 /app/views/layouts | |
parent | bc9fa07b26184b5c94808f704db6ea1ac81bf4de (diff) |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'app/views/layouts')
-rw-r--r-- | app/views/layouts/devise.html.haml | 6 | ||||
-rw-r--r-- | app/views/layouts/devise_empty.html.haml | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml index d36e08f44a4..6a261bbbc46 100644 --- a/app/views/layouts/devise.html.haml +++ b/app/views/layouts/devise.html.haml @@ -38,7 +38,9 @@ %hr.footer-fixed .container.footer-container .footer-links - = link_to _("Explore"), explore_root_path - = link_to _("Help"), help_path + - if !public_visibility_restricted? + = link_to _("Explore"), explore_root_path + = link_to _("Help"), help_path = link_to _("About GitLab"), "https://about.gitlab.com/" + = footer_message diff --git a/app/views/layouts/devise_empty.html.haml b/app/views/layouts/devise_empty.html.haml index ff2b00ea376..6ac80a5aba3 100644 --- a/app/views/layouts/devise_empty.html.haml +++ b/app/views/layouts/devise_empty.html.haml @@ -14,7 +14,8 @@ %hr .container .footer-links - = link_to _("Explore"), explore_root_path - = link_to _("Help"), help_path + - if !public_visibility_restricted? + = link_to _("Explore"), explore_root_path + = link_to _("Help"), help_path = link_to _("About GitLab"), "https://about.gitlab.com/" = footer_message |