diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-10-06 21:45:46 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-10-06 21:45:46 +0900 |
| commit | 3e26b0dcd113ade77dc8304137c6733cab4c8718 (patch) | |
| tree | 319a7c20491a4b0c2f5da10ee23f4ae7ae536de8 | |
| parent | cd438a6ae00285e2cd32ea73a1cd769a5f9d7403 (diff) | |
| parent | f4c10492f43f7d7a3790836d79680621faa38bd2 (diff) | |
| download | gitlab-ce-3e26b0dcd113ade77dc8304137c6733cab4c8718.tar.gz | |
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
| -rw-r--r-- | app/views/layouts/nav/sidebar/_project.html.haml | 2 | ||||
| -rw-r--r-- | spec/javascripts/fixtures/clusters.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml index 27ad0fdac1d..759d6ff68ea 100644 --- 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 diff --git a/spec/javascripts/fixtures/clusters.rb b/spec/javascripts/fixtures/clusters.rb index bf8ba8146da..5774f36f026 100644 --- 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 |