Merge branch 'highlight-cluster-settings-message' into 'master'
Highlight cluster settings message Closes #41274 See merge request gitlab-org/gitlab-ce!19996
This commit is contained in:
commit
40a66cb550
2 changed files with 8 additions and 2 deletions
|
@ -16,5 +16,6 @@
|
|||
= _('or')
|
||||
= link_to('create a new Google account', 'https://accounts.google.com/SignUpWithoutGmail?service=cloudconsole&continue=https%3A%2F%2Fconsole.cloud.google.com%2Ffreetrial%3Futm_campaign%3D2018_cpanel%26utm_source%3Dgitlab%26utm_medium%3Dreferral', target: '_blank', rel: 'noopener noreferrer')
|
||||
- else
|
||||
.settings-message.text-center
|
||||
- link = link_to(s_('ClusterIntegration|properly configured'), help_page_path("integration/google"), target: '_blank', rel: 'noopener noreferrer')
|
||||
= s_('Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service.').html_safe % { link_to_documentation: link }
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Highlight cluster settings message
|
||||
merge_request: 19996
|
||||
author: George Tsiolis
|
||||
type: changed
|
Loading…
Reference in a new issue