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
5754908f
Commit
5754908f
authored
Oct 27, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds buttons to the first page.
Moves first page into a new one
parent
e9d35261
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
3 deletions
+24
-3
app/controllers/projects/clusters_controller.rb
app/controllers/projects/clusters_controller.rb
+6
-1
app/views/projects/clusters/new.html.haml
app/views/projects/clusters/new.html.haml
+9
-2
app/views/projects/clusters/new_kubernetes_form.html.haml
app/views/projects/clusters/new_kubernetes_form.html.haml
+9
-0
No files found.
app/controllers/projects/clusters_controller.rb
View file @
5754908f
...
@@ -26,10 +26,15 @@ class Projects::ClustersController < Projects::ApplicationController
...
@@ -26,10 +26,15 @@ class Projects::ClustersController < Projects::ApplicationController
end
end
end
end
def
new
# TODO fix this
def
new_kubernetes_form
@cluster
=
project
.
build_cluster
@cluster
=
project
.
build_cluster
end
end
def
new
# First page!
end
def
create
def
create
@cluster
=
Ci
::
CreateClusterService
@cluster
=
Ci
::
CreateClusterService
.
new
(
project
,
current_user
,
create_params
)
.
new
(
project
,
current_user
,
create_params
)
...
...
app/views/projects/clusters/new.html.haml
View file @
5754908f
...
@@ -5,5 +5,12 @@
...
@@ -5,5 +5,12 @@
.col-sm-4
.col-sm-4
=
render
'sidebar'
=
render
'sidebar'
.col-sm-8
.col-sm-8
=
render
'header'
%h4
=
s_
(
'ClusterIntegration|Choose how to set up cluster integration'
)
=
render
'form'
%p
=
s_
(
'ClusterIntegration| Create a new cluster on Google Engine right from GitLab'
)
-# TODO FIX PATH
=
link_to
s_
(
'ClusterIntegration|Create on GKE'
),
providers_gcp_login_project_clusters_path
(
@project
),
class:
'btn append-bottom-20'
-# TODO FIX PATH
%p
=
s_
(
'ClusterIntegration| Enter the details for an existing Kubernetes cluster'
)
=
link_to
s_
(
'ClusterIntegration|Add an existing cluster'
),
project_settings_integrations_path
(
@project
),
class:
'btn append-bottom-20'
app/views/projects/clusters/new_kubernetes_form.html.haml
0 → 100644
View file @
5754908f
-
breadcrumb_title
"Cluster"
-
page_title
_
(
"New Cluster"
)
.row.prepend-top-default
.col-sm-4
=
render
'sidebar'
.col-sm-8
=
render
'header'
=
render
'form'
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