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
1b006b45
Commit
1b006b45
authored
Nov 05, 2018
by
Mike Greiling
Committed by
Kamil Trzciński
Nov 09, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move "add cluster" button partial to match CE
parent
e1559872
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
6 deletions
+11
-6
app/views/clusters/clusters/_buttons.html.haml
app/views/clusters/clusters/_buttons.html.haml
+4
-0
app/views/clusters/clusters/index.html.haml
app/views/clusters/clusters/index.html.haml
+1
-1
ee/app/views/clusters/clusters/_buttons.html.haml
ee/app/views/clusters/clusters/_buttons.html.haml
+6
-0
ee/app/views/projects/ee/clusters/_buttons.html.haml
ee/app/views/projects/ee/clusters/_buttons.html.haml
+0
-5
No files found.
app/views/clusters/clusters/_buttons.html.haml
0 → 100644
View file @
1b006b45
-# This partial is overridden in EE
.nav-controls
%span
.btn.btn-add-cluster.disabled.js-add-cluster
=
s_
(
"ClusterIntegration|Add Kubernetes cluster"
)
app/views/clusters/clusters/index.html.haml
View file @
1b006b45
...
...
@@ -10,7 +10,7 @@
.top-area.adjust
.nav-text
=
s_
(
"ClusterIntegration|Kubernetes clusters can be used to deploy applications and to provide Review Apps for this project"
)
=
render
'
projects/ee/clusters/buttons'
,
project:
@project
=
render
'
clusters/clusters/buttons'
.ci-table.js-clusters-list
.gl-responsive-table-row.table-row-header
{
role:
"row"
}
.table-section.section-30
{
role:
"rowheader"
}
...
...
ee/app/views/clusters/clusters/_buttons.html.haml
0 → 100644
View file @
1b006b45
.nav-controls
-
if
clusterable
.
feature_available?
(
:multiple_clusters
)
=
link_to
s_
(
"ClusterIntegration|Add Kubernetes cluster"
),
clusterable
.
new_path
,
class:
"btn btn-success btn-add-cluster has-tooltip js-add-cluster"
-
else
%span
.btn.btn-add-cluster.disabled.js-add-cluster
=
s_
(
"ClusterIntegration|Add Kubernetes cluster"
)
ee/app/views/projects/ee/clusters/_buttons.html.haml
deleted
100644 → 0
View file @
e1559872
.nav-controls
-
if
project
.
feature_available?
(
:multiple_clusters
)
=
link_to
s_
(
"ClusterIntegration|Add Kubernetes cluster"
),
new_project_cluster_path
(
project
),
class:
"btn btn-success btn-add-cluster has-tooltip js-add-cluster"
-
else
=
link_to
s_
(
"ClusterIntegration|Add Kubernetes cluster"
),
new_project_cluster_path
(
project
),
class:
"btn btn-success btn-add-cluster disabled has-tooltip js-add-cluster"
,
title:
s_
(
"ClusterIntegration|Multiple Kubernetes clusters are available in GitLab Enterprise Edition Premium and Ultimate"
)
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