Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
b2b4f262
Commit
b2b4f262
authored
Dec 03, 2017
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
First round of tests
parent
c63641ea
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
68 additions
and
221 deletions
+68
-221
app/controllers/projects/clusters/gcp_controller.rb
app/controllers/projects/clusters/gcp_controller.rb
+0
-8
app/controllers/projects/clusters_controller.rb
app/controllers/projects/clusters_controller.rb
+1
-1
app/views/layouts/nav/sidebar/_project.html.haml
app/views/layouts/nav/sidebar/_project.html.haml
+3
-3
spec/controllers/projects/clusters_controller_spec.rb
spec/controllers/projects/clusters_controller_spec.rb
+64
-209
No files found.
app/controllers/projects/clusters/gcp_controller.rb
View file @
b2b4f262
...
@@ -50,14 +50,6 @@ class Projects::Clusters::GcpController < Projects::ApplicationController
...
@@ -50,14 +50,6 @@ class Projects::Clusters::GcpController < Projects::ApplicationController
)
)
end
end
def
update_params
params
.
require
(
:cluster
).
permit
(
:enabled
,
platform_kubernetes_attributes:
[
:namespace
])
end
def
authorize_google_api
def
authorize_google_api
unless
GoogleApi
::
CloudPlatform
::
Client
.
new
(
token_in_session
,
nil
)
unless
GoogleApi
::
CloudPlatform
::
Client
.
new
(
token_in_session
,
nil
)
.
validate_token
(
expires_at_in_session
)
.
validate_token
(
expires_at_in_session
)
...
...
app/controllers/projects/clusters_controller.rb
View file @
b2b4f262
...
@@ -77,7 +77,7 @@ class Projects::ClustersController < Projects::ApplicationController
...
@@ -77,7 +77,7 @@ class Projects::ClustersController < Projects::ApplicationController
:token
,
:token
,
:ca_cert
,
:ca_cert
,
:namespace
:namespace
]
]
)
)
end
end
end
end
...
...
app/views/layouts/nav/sidebar/_project.html.haml
View file @
b2b4f262
...
@@ -146,7 +146,7 @@
...
@@ -146,7 +146,7 @@
=
number_with_delimiter
(
@project
.
open_merge_requests_count
)
=
number_with_delimiter
(
@project
.
open_merge_requests_count
)
-
if
project_nav_tab?
:pipelines
-
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
=
link_to
project_pipelines_path
(
@project
),
class:
'shortcuts-pipelines'
do
.nav-icon-container
.nav-icon-container
=
sprite_icon
(
'pipeline'
)
=
sprite_icon
(
'pipeline'
)
...
@@ -154,7 +154,7 @@
...
@@ -154,7 +154,7 @@
CI / CD
CI / CD
%ul
.sidebar-sub-level-items
%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
=
link_to
project_pipelines_path
(
@project
)
do
%strong
.fly-out-top-item-name
%strong
.fly-out-top-item-name
#{
_
(
'CI / CD'
)
}
#{
_
(
'CI / CD'
)
}
...
@@ -184,7 +184,7 @@
...
@@ -184,7 +184,7 @@
Environments
Environments
-
if
project_nav_tab?
:clusters
-
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
=
link_to
project_clusters_path
(
@project
),
title:
'Cluster'
,
class:
'shortcuts-cluster'
do
%span
%span
Cluster
Cluster
...
...
spec/controllers/projects/clusters_controller_spec.rb
View file @
b2b4f262
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment