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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
9616e70a
Commit
9616e70a
authored
Dec 16, 2017
by
Matija Čupić
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow environment_scope in cluster controllers
parent
30696747
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
0 deletions
+4
-0
app/controllers/projects/clusters/gcp_controller.rb
app/controllers/projects/clusters/gcp_controller.rb
+1
-0
app/controllers/projects/clusters/user_controller.rb
app/controllers/projects/clusters/user_controller.rb
+1
-0
app/controllers/projects/clusters_controller.rb
app/controllers/projects/clusters_controller.rb
+2
-0
No files found.
app/controllers/projects/clusters/gcp_controller.rb
View file @
9616e70a
...
@@ -39,6 +39,7 @@ class Projects::Clusters::GcpController < Projects::ApplicationController
...
@@ -39,6 +39,7 @@ class Projects::Clusters::GcpController < Projects::ApplicationController
params
.
require
(
:cluster
).
permit
(
params
.
require
(
:cluster
).
permit
(
:enabled
,
:enabled
,
:name
,
:name
,
:environment_scope
,
provider_gcp_attributes:
[
provider_gcp_attributes:
[
:gcp_project_id
,
:gcp_project_id
,
:zone
,
:zone
,
...
...
app/controllers/projects/clusters/user_controller.rb
View file @
9616e70a
...
@@ -26,6 +26,7 @@ class Projects::Clusters::UserController < Projects::ApplicationController
...
@@ -26,6 +26,7 @@ class Projects::Clusters::UserController < Projects::ApplicationController
params
.
require
(
:cluster
).
permit
(
params
.
require
(
:cluster
).
permit
(
:enabled
,
:enabled
,
:name
,
:name
,
:environment_scope
,
platform_kubernetes_attributes:
[
platform_kubernetes_attributes:
[
:namespace
,
:namespace
,
:api_url
,
:api_url
,
...
...
app/controllers/projects/clusters_controller.rb
View file @
9616e70a
...
@@ -87,6 +87,7 @@ class Projects::ClustersController < Projects::ApplicationController
...
@@ -87,6 +87,7 @@ class Projects::ClustersController < Projects::ApplicationController
if
cluster
.
managed?
if
cluster
.
managed?
params
.
require
(
:cluster
).
permit
(
params
.
require
(
:cluster
).
permit
(
:enabled
,
:enabled
,
:environment_scope
,
platform_kubernetes_attributes:
[
platform_kubernetes_attributes:
[
:namespace
:namespace
]
]
...
@@ -95,6 +96,7 @@ class Projects::ClustersController < Projects::ApplicationController
...
@@ -95,6 +96,7 @@ class Projects::ClustersController < Projects::ApplicationController
params
.
require
(
:cluster
).
permit
(
params
.
require
(
:cluster
).
permit
(
:enabled
,
:enabled
,
:name
,
:name
,
:environment_scope
,
platform_kubernetes_attributes:
[
platform_kubernetes_attributes:
[
:api_url
,
:api_url
,
:token
,
:token
,
...
...
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