diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-20 16:12:23 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-20 16:12:23 +0000 |
| commit | 40a66cb550cf7b5e1b0a6e3816b91026ba2dd6ca (patch) | |
| tree | 0cd07d9b5a53745d74a0f0d6bc113c328cbbf87d | |
| parent | 71c4a8a063709f9eacfb60531a06f9d8d0620e1f (diff) | |
| parent | 0cde6bb7a68a34c79bf0f641d7ccd425c4f49c34 (diff) | |
| download | gitlab-ce-40a66cb550cf7b5e1b0a6e3816b91026ba2dd6ca.tar.gz | |
Merge branch 'highlight-cluster-settings-message' into 'master'
Highlight cluster settings message
Closes #41274
See merge request gitlab-org/gitlab-ce!19996
| -rw-r--r-- | app/views/projects/clusters/gcp/login.html.haml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/highlight-cluster-settings-message.yml | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/views/projects/clusters/gcp/login.html.haml b/app/views/projects/clusters/gcp/login.html.haml index 55a42ac4847..96c7a648676 100644 --- a/app/views/projects/clusters/gcp/login.html.haml +++ b/app/views/projects/clusters/gcp/login.html.haml @@ -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 - - 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 } + .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 } diff --git a/changelogs/unreleased/highlight-cluster-settings-message.yml b/changelogs/unreleased/highlight-cluster-settings-message.yml new file mode 100644 index 00000000000..4e029941c51 --- /dev/null +++ b/changelogs/unreleased/highlight-cluster-settings-message.yml @@ -0,0 +1,5 @@ +--- +title: Highlight cluster settings message +merge_request: 19996 +author: George Tsiolis +type: changed |