diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-05-30 20:24:09 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-05-30 20:24:09 +0000 |
| commit | 77462804879488f08f237ec14f5bc9571536d891 (patch) | |
| tree | 48e7e0e775037b915190bf9c138c7bfd4e578fb5 | |
| parent | 7d1a9ef3ec7d002c899fcd7b41b9030aaebd3a7c (diff) | |
| parent | 27913aabbc66c38bd639d54d716097f44a038949 (diff) | |
| download | gitlab-ce-77462804879488f08f237ec14f5bc9571536d891.tar.gz | |
Merge branch 'fix-nbsp-after-sign-in-with-google' into 'master'
Fix after sign-in with Google button
Closes #45551
See merge request gitlab-org/gitlab-ce!19249
| -rw-r--r-- | app/views/projects/clusters/gcp/login.html.haml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-nbsp-after-sign-in-with-google.yml | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/views/projects/clusters/gcp/login.html.haml b/app/views/projects/clusters/gcp/login.html.haml index f1771349a53..55a42ac4847 100644 --- a/app/views/projects/clusters/gcp/login.html.haml +++ b/app/views/projects/clusters/gcp/login.html.haml @@ -12,8 +12,7 @@ .row .col-sm-8.offset-sm-4.signin-with-google - if @authorize_url - = link_to @authorize_url do - = image_tag('auth_buttons/signin_with_google.png', width: '191px') + = link_to(image_tag('auth_buttons/signin_with_google.png', width: '191px'), @authorize_url) = _('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 diff --git a/changelogs/unreleased/fix-nbsp-after-sign-in-with-google.yml b/changelogs/unreleased/fix-nbsp-after-sign-in-with-google.yml new file mode 100644 index 00000000000..73b478eff3e --- /dev/null +++ b/changelogs/unreleased/fix-nbsp-after-sign-in-with-google.yml @@ -0,0 +1,5 @@ +--- +title: Fix after sign-in with Google button +merge_request: +author: +type: fixed |