Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-12-03 17:33:10 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2017-12-03 17:33:10 +0300
commitb2b4f262d52980c236cfc97326904736d0351f27 (patch)
tree2400d434a7bf1650e83ed42e5d2d8c7948bfe845 /app
parentc63641ea8687cb0f2c138c618d7a03014f37957f (diff)
First round of tests
Diffstat (limited to 'app')
-rw-r--r--app/controllers/projects/clusters/gcp_controller.rb8
-rw-r--r--app/controllers/projects/clusters_controller.rb2
-rw-r--r--app/views/layouts/nav/sidebar/_project.html.haml6
3 files changed, 4 insertions, 12 deletions
diff --git a/app/controllers/projects/clusters/gcp_controller.rb b/app/controllers/projects/clusters/gcp_controller.rb
index 5e909a57345..66fcceccb37 100644
--- a/app/controllers/projects/clusters/gcp_controller.rb
+++ b/app/controllers/projects/clusters/gcp_controller.rb
@@ -50,14 +50,6 @@ class Projects::Clusters::GcpController < Projects::ApplicationController
)
end
- def update_params
- params.require(:cluster).permit(
- :enabled,
- platform_kubernetes_attributes: [
- :namespace
- ])
- end
-
def authorize_google_api
unless GoogleApi::CloudPlatform::Client.new(token_in_session, nil)
.validate_token(expires_at_in_session)
diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb
index ab32930a434..3c8cecc6425 100644
--- a/app/controllers/projects/clusters_controller.rb
+++ b/app/controllers/projects/clusters_controller.rb
@@ -77,7 +77,7 @@ class Projects::ClustersController < Projects::ApplicationController
:token,
:ca_cert,
:namespace
- ]
+ ]
)
end
end
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml
index ff638f17ffc..8b2d2a5c74d 100644
--- a/app/views/layouts/nav/sidebar/_project.html.haml
+++ b/app/views/layouts/nav/sidebar/_project.html.haml
@@ -146,7 +146,7 @@
= number_with_delimiter(@project.open_merge_requests_count)
- if project_nav_tab? :pipelines
- = nav_link(controller: [:pipelines, :builds, :jobs, :pipeline_schedules, :environments, :artifacts, :clusters]) do
+ = nav_link(controller: [:pipelines, :builds, :jobs, :pipeline_schedules, :environments, :artifacts, :clusters, :user, :gcp]) do
= link_to project_pipelines_path(@project), class: 'shortcuts-pipelines' do
.nav-icon-container
= sprite_icon('pipeline')
@@ -154,7 +154,7 @@
CI / CD
%ul.sidebar-sub-level-items
- = nav_link(controller: [:pipelines, :builds, :jobs, :pipeline_schedules, :environments, :artifacts, :clusters, :kubernetes, :gcp], html_options: { class: "fly-out-top-item" } ) do
+ = nav_link(controller: [:pipelines, :builds, :jobs, :pipeline_schedules, :environments, :artifacts, :clusters, :user, :gcp], html_options: { class: "fly-out-top-item" } ) do
= link_to project_pipelines_path(@project) do
%strong.fly-out-top-item-name
#{ _('CI / CD') }
@@ -184,7 +184,7 @@
Environments
- if project_nav_tab? :clusters
- = nav_link(controller: [:clusters, :kubernetes, :gcp]) do
+ = nav_link(controller: [:clusters, :user, :gcp]) do
= link_to project_clusters_path(@project), title: 'Cluster', class: 'shortcuts-cluster' do
%span
Cluster