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

Merge branch…
3e26b0dc · Shinya Maeda · cd438a6a · f4c10492 · 3e26b0dc · 3e26b0dc
Commit 3e26b0dc authored Oct 06, 2017 by Shinya Maeda
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

_project.html.haml app/views/layouts/nav/sidebar/_project.html.haml +1 -1

clusters.rb spec/javascripts/fixtures/clusters.rb +1 -1

No files found.
--- a/app/views/layouts/nav/sidebar/_project.html.haml
+++ b/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


--- a/spec/javascripts/fixtures/clusters.rb
+++ b/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