Read about our upcoming Code of Conduct on this issue

Commit 3e26b0dc authored by Shinya Maeda's avatar Shinya Maeda
Browse files

Merge branch...

Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' of https://gitlab.com/gitlab-org/gitlab-ce into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
......@@ -191,7 +191,7 @@
- if project_nav_tab? :clusters
= nav_link(controller: :clusters) do
= link_to project_clusters_path(@project), title: 'Cluster', class: 'shortcuts-clusters' do
= link_to project_clusters_path(@project), title: 'Cluster', class: 'shortcuts-cluster' do
%span
Cluster
......
......@@ -11,7 +11,7 @@
render_views
before(:all) do
clean_frontend_fixtures('branches/')
clean_frontend_fixtures('clusters/')
end
before do
......
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