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
db30e7f3
Commit
db30e7f3
authored
May 24, 2018
by
Dennis Tang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use implied route for clusters#create
parent
250a8aee
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
7 deletions
+3
-7
app/views/projects/clusters/gcp/_form.html.haml
app/views/projects/clusters/gcp/_form.html.haml
+1
-1
app/views/projects/clusters/user/_form.html.haml
app/views/projects/clusters/user/_form.html.haml
+1
-1
config/routes/project.rb
config/routes/project.rb
+1
-5
No files found.
app/views/projects/clusters/gcp/_form.html.haml
View file @
db30e7f3
...
...
@@ -6,7 +6,7 @@
%p
=
link_to
(
'Select a different Google account'
,
@authorize_url
)
=
form_for
@new_cluster
,
html:
{
class:
'js-gke-cluster-creation prepend-top-20'
,
data:
{
token:
@token_in_session
}
},
url:
new_
namespace_project_clusters_path
(
@project
.
namespace
,
@project
,
{
type:
'new'
}),
as: :cluster
do
|
field
|
=
form_for
@new_cluster
,
html:
{
class:
'js-gke-cluster-creation prepend-top-20'
,
data:
{
token:
@token_in_session
}
},
url:
namespace_project_clusters_path
(
@project
.
namespace
,
@project
,
{
type:
'new'
}),
as: :cluster
do
|
field
|
=
form_errors
(
@new_cluster
)
.form-group
=
field
.
label
:name
,
s_
(
'ClusterIntegration|Kubernetes cluster name'
)
...
...
app/views/projects/clusters/user/_form.html.haml
View file @
db30e7f3
=
form_for
@existing_cluster
,
url:
n
ew_n
amespace_project_clusters_path
(
@project
.
namespace
,
@project
,
{
type:
'existing'
}),
as: :cluster
do
|
field
|
=
form_for
@existing_cluster
,
url:
namespace_project_clusters_path
(
@project
.
namespace
,
@project
,
{
type:
'existing'
}),
as: :cluster
do
|
field
|
=
form_errors
(
@existing_cluster
)
.form-group
=
field
.
label
:name
,
s_
(
'ClusterIntegration|Kubernetes cluster name'
)
...
...
config/routes/project.rb
View file @
db30e7f3
...
...
@@ -204,11 +204,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
end
end
resources
:clusters
,
except:
[
:edit
,
:create
]
do
collection
do
post
'/new'
,
to:
'clusters#create'
end
resources
:clusters
,
except:
[
:edit
]
do
member
do
get
:status
,
format: :json
...
...
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