Commit 25f4e5f4 authored by Sean McGivern's avatar Sean McGivern

Merge branch '202101-make-project-buttons-fit-in-1-row' into 'master'

Resolve "Make project buttons fit in 1 row"

Closes #202101

See merge request gitlab-org/gitlab!24487
parents 108e8eb4 957f4c65
......@@ -302,7 +302,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
cluster_link = clusters.count == 1 ? project_cluster_path(project, clusters.first) : project_clusters_path(project)
AnchorData.new(false,
_('Kubernetes configured'),
_('Kubernetes'),
cluster_link,
'default')
end
......
---
title: Rename 'Kubernetes configured' button
merge_request: 24487
author:
type: changed
......@@ -24,7 +24,7 @@ describe 'Project show page', :feature do
visit project_path(project)
page.within('.project-buttons') do
expect(page).to have_link('Kubernetes configured', href: project_clusters_path(project))
expect(page).to have_link('Kubernetes', href: project_clusters_path(project))
end
end
end
......
......@@ -10903,9 +10903,6 @@ msgstr ""
msgid "Kubernetes cluster was successfully updated."
msgstr ""
msgid "Kubernetes configured"
msgstr ""
msgid "Kubernetes deployment not found"
msgstr ""
......
......@@ -33,7 +33,7 @@ describe 'Projects > Show > User sees setup shortcut buttons' do
expect(page).not_to have_link('Enable Auto DevOps')
expect(page).not_to have_link('Auto DevOps enabled')
expect(page).not_to have_link('Add Kubernetes cluster')
expect(page).not_to have_link('Kubernetes configured')
expect(page).not_to have_link('Kubernetes')
end
end
end
......@@ -100,7 +100,7 @@ describe 'Projects > Show > User sees setup shortcut buttons' do
it 'no Kubernetes cluster button if can not manage clusters' do
page.within('.project-buttons') do
expect(page).not_to have_link('Add Kubernetes cluster')
expect(page).not_to have_link('Kubernetes configured')
expect(page).not_to have_link('Kubernetes')
end
end
end
......@@ -308,7 +308,7 @@ describe 'Projects > Show > User sees setup shortcut buttons' do
visit project_path(project)
page.within('.project-buttons') do
expect(page).to have_link('Kubernetes configured', href: project_cluster_path(project, cluster))
expect(page).to have_link('Kubernetes', href: project_cluster_path(project, cluster))
end
end
end
......
......@@ -467,7 +467,7 @@ describe ProjectPresenter do
expect(presenter.kubernetes_cluster_anchor_data).to have_attributes(
is_link: false,
label: a_string_including('Kubernetes configured'),
label: a_string_including('Kubernetes'),
link: presenter.project_cluster_path(project, cluster)
)
end
......@@ -480,7 +480,7 @@ describe ProjectPresenter do
expect(presenter.kubernetes_cluster_anchor_data).to have_attributes(
is_link: false,
label: a_string_including('Kubernetes configured'),
label: a_string_including('Kubernetes'),
link: presenter.project_clusters_path(project)
)
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