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
d406b1d4
Commit
d406b1d4
authored
Jan 09, 2020
by
Tiger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use consistent layout in cluster advanced settings
https://gitlab.com/gitlab-org/gitlab/merge_requests/22656
parent
a82c4514
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
15 deletions
+18
-15
app/views/clusters/clusters/_advanced_settings.html.haml
app/views/clusters/clusters/_advanced_settings.html.haml
+13
-15
changelogs/unreleased/tidy-cluster-advanced-settings.yml
changelogs/unreleased/tidy-cluster-advanced-settings.yml
+5
-0
No files found.
app/views/clusters/clusters/_advanced_settings.html.haml
View file @
d406b1d4
...
...
@@ -6,27 +6,25 @@
-
if
can?
(
current_user
,
:admin_cluster
,
@cluster
)
-
unless
@cluster
.
provided_by_user?
.
append-bottom-20
%
label
.append-bottom-10
.
sub-section.form-group
%
h4
=
@cluster
.
provider_label
%p
-
provider_link
=
link_to
(
@cluster
.
provider_label
,
@cluster
.
provider_management_url
,
target:
'_blank'
,
rel:
'noopener noreferrer'
)
=
s_
(
'ClusterIntegration|Manage your Kubernetes cluster by visiting %{provider_link}'
).
html_safe
%
{
provider_link:
provider_link
}
.sub-section.form-group
=
form_for
@cluster
,
url:
clusterable
.
cluster_path
(
@cluster
),
as: :cluster
,
html:
{
class:
'cluster_management_form'
}
do
|
field
|
%h5
%h4
=
s_
(
'ClusterIntegration|Cluster management project (alpha)'
)
.form-group
.form-text.text-muted
%p
=
project_select_tag
(
'cluster[management_project_id]'
,
class:
'hidden-filter-value'
,
toggle_class:
'js-project-search js-project-filter js-filter-submit'
,
dropdown_class:
'dropdown-menu-selectable dropdown-menu-project js-filter-submit'
,
placeholder:
_
(
'Select project'
),
idAttribute:
'id'
,
data:
{
order_by:
'last_activity_at'
,
idattribute:
'id'
,
simple_filter:
true
,
allow_clear:
true
,
include_groups:
false
,
include_projects_in_subgroups:
true
,
group_id:
group_id
,
user_id:
user_id
},
value:
@cluster
.
management_project_id
)
.text-muted
=
s_
(
'ClusterIntegration|A cluster management project can be used to run deployment jobs with Kubernetes <code>cluster-admin</code> privileges.'
).
html_safe
=
link_to
_
(
'More information'
),
help_page_path
(
'user/clusters/management_project.md'
),
target:
'_blank'
.form-group
=
field
.
submit
_
(
'Save changes'
),
class:
'btn btn-success qa-save-domain'
=
field
.
submit
_
(
'Save changes'
),
class:
'btn btn-success'
-
if
@cluster
.
managed?
.sub-section.form-group
...
...
changelogs/unreleased/tidy-cluster-advanced-settings.yml
0 → 100644
View file @
d406b1d4
---
title
:
Use consistent layout in cluster advanced settings
merge_request
:
22656
author
:
type
:
other
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