summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2017-11-30 18:09:32 +0100
committerMatija Čupić <matteeyah@gmail.com>2017-11-30 18:09:32 +0100
commit74bdaae6cb70f978f64792e7435621e961dd5e89 (patch)
treef18e188ab0aecadcdef426cf5d24c1e1e0baca9e
parent5f129bdecd39955cc99b9609e292b0ced731e698 (diff)
downloadgitlab-ce-74bdaae6cb70f978f64792e7435621e961dd5e89.tar.gz
Add link to create Google account in clusters page
-rw-r--r--app/views/projects/clusters/login.html.haml2
-rw-r--r--spec/features/projects/clusters_spec.rb1
2 files changed, 3 insertions, 0 deletions
diff --git a/app/views/projects/clusters/login.html.haml b/app/views/projects/clusters/login.html.haml
index fde030b500b..e4bc58b1fab 100644
--- a/app/views/projects/clusters/login.html.haml
+++ b/app/views/projects/clusters/login.html.haml
@@ -11,6 +11,8 @@
- if @authorize_url
= link_to @authorize_url do
= image_tag('auth_buttons/signin_with_google.png', width: '191px')
+ = s_('ClusterIntegration|or create a new')
+ = link_to('Google account', 'https://accounts.google.com/signup', 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 }
diff --git a/spec/features/projects/clusters_spec.rb b/spec/features/projects/clusters_spec.rb
index 197e6df4997..018758d1bf1 100644
--- a/spec/features/projects/clusters_spec.rb
+++ b/spec/features/projects/clusters_spec.rb
@@ -201,6 +201,7 @@ feature 'Clusters', :js do
it 'user sees a login page' do
expect(page).to have_css('.signin-with-google')
+ expect(page).to have_link('Google account')
end
end
end