diff options
| author | Phil Hughes <me@iamphill.com> | 2017-10-18 11:10:41 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-10-18 11:10:41 +0000 |
| commit | 1d72952dc340024cba9bba94d87e871e043164f9 (patch) | |
| tree | 620921a7322b8309443430c6372382684602e145 | |
| parent | 11dfe0489b1bbe7f0e43eaa72fcdf7140efcbc2f (diff) | |
| parent | 5df66e6b8dcac20efbfbf9ba9c1e3a8f3d1129dc (diff) | |
| download | gitlab-ce-35616-gke-1st-iteration.tar.gz | |
Merge branch '39201-improve-google-image' into 'master'35616-gke-1st-iteration
Replace google login image
Closes #39201
See merge request gitlab-org/gitlab-ce!14919
| -rw-r--r-- | app/assets/images/auth_buttons/signin_with_google.png | bin | 3983 -> 8001 bytes | |||
| -rw-r--r-- | app/views/projects/clusters/login.html.haml | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/images/auth_buttons/signin_with_google.png b/app/assets/images/auth_buttons/signin_with_google.png Binary files differindex b1327b4f7b4..f27bb243304 100644 --- a/app/assets/images/auth_buttons/signin_with_google.png +++ b/app/assets/images/auth_buttons/signin_with_google.png diff --git a/app/views/projects/clusters/login.html.haml b/app/views/projects/clusters/login.html.haml index ae132672b7e..fde030b500b 100644 --- a/app/views/projects/clusters/login.html.haml +++ b/app/views/projects/clusters/login.html.haml @@ -10,7 +10,7 @@ .col-sm-8.col-sm-offset-4.signin-with-google - if @authorize_url = link_to @authorize_url do - = image_tag('auth_buttons/signin_with_google.png') + = image_tag('auth_buttons/signin_with_google.png', width: '191px') - 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 } |
