Commit 777ca883 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '9233-update-explore-geo-page' into 'master'

Hide New node button to avoid unsupported setup flow

Closes #9233

See merge request gitlab-org/gitlab!21448
parents 3eb0e42c d4bd9ac3
......@@ -6,6 +6,7 @@
.d-flex.align-items-center.border-bottom.border-default.mb-4
%h2.page-title
= _("Geo Nodes")
- if @nodes.any?
= link_to s_("GeoNodes|New node"), new_admin_geo_node_path, class: 'btn btn-success ml-auto qa-new-node-link'
%p.page-subtitle.light
......
......@@ -4,7 +4,7 @@
= image_tag 'illustrations/gitlab_geo.svg'
.col-12
.text-content
%h4.text-center= _("Discover GitLab Geo")
%p= _("Make everyone on your team more productive regardless of their location. GitLab Geo creates read-only mirrors of your GitLab instance so you can reduce the time it takes to clone and fetch large repos.")
.text-center
= link_to _('Learn more'), 'https://about.gitlab.com/features/gitlab-geo/', rel: 'nofollow', class: 'btn btn-success'
%h4.text-center= _('Discover GitLab Geo')
%p
= _('Make everyone on your team more productive regardless of their location. GitLab Geo creates read-only mirrors of your GitLab instance so you can reduce the time it takes to clone and fetch large repos.')
= link_to _('More information'), 'https://about.gitlab.com/features/gitlab-geo/', rel: 'nofollow'
---
title: Update Explore Geo Page
merge_request: 21448
author:
type: changed
......@@ -199,4 +199,22 @@ describe 'admin Geo Nodes', :js, :geo do
expect(page).not_to have_css('.card')
end
end
describe 'with no Geo Nodes' do
before do
geo_node.delete
visit admin_geo_nodes_path
wait_for_requests
end
it 'hides the New Node button' do
expect(page).not_to have_link('New node', href: new_admin_geo_node_path)
end
it 'shows Discover GitLab Geo' do
page.within(find('h4')) do
expect(page).to have_content('Discover GitLab Geo')
end
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment