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

app/views/layouts/nav/sidebar/_project.html.haml

@@ -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
 

spec/javascripts/fixtures/clusters.rb

@@ -11,7 +11,7 @@ describe Projects::ClustersController, '(JavaScript fixtures)', type: :controlle
   render_views
 
   before(:all) do
-    clean_frontend_fixtures('branches/')
+    clean_frontend_fixtures('clusters/')
   end
 
   before do