summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-05-30 15:33:46 +0200
committerKamil Trzciński <ayufan@ayufan.eu>2018-05-30 15:33:54 +0200
commit27913aabbc66c38bd639d54d716097f44a038949 (patch)
treeb7977cbb4b484e4c0cb4deb9112faacde6240f60
parent47555ef85e2a138e5ac16bfff597b7e72f818b25 (diff)
downloadgitlab-ce-fix-nbsp-after-sign-in-with-google.tar.gz
Fix &nbsp; after sign-in with Google buttonfix-nbsp-after-sign-in-with-google
-rw-r--r--app/views/projects/clusters/gcp/login.html.haml3
-rw-r--r--changelogs/unreleased/fix-nbsp-after-sign-in-with-google.yml5
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 ff046c59a7a..6bc81c97811 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.col-sm-offset-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 &nbsp; after sign-in with Google button
+merge_request:
+author:
+type: fixed