BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
8f3a6923
Commit
8f3a6923
authored
Nov 03, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix clusters description text collapsing away on page-load
Fix
https://gitlab.com/gitlab-org/gitlab-ce/issues/39771
Caused by
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13363
parent
f580e497
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
show.html.haml
app/views/projects/clusters/show.html.haml
+6
-6
No files found.
app/views/projects/clusters/show.html.haml
View file @
8f3a6923
...
...
@@ -10,9 +10,9 @@
cluster_status:
@cluster
.
status_name
,
cluster_status_reason:
@cluster
.
status_reason
}
}
%section
.settings
%section
.settings
.no-animate.expanded
%h4
=
s_
(
'ClusterIntegration|Enable cluster integration'
)
.settings-content
.expanded
.settings-content
.hidden.js-cluster-error.alert.alert-danger.alert-block.append-bottom-10
{
role:
'alert'
}
=
s_
(
'ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine'
)
...
...
@@ -49,14 +49,14 @@
.form-group
=
field
.
submit
_
(
'Save'
),
class:
'btn btn-success'
%section
.settings
#js-cluster-details
%section
.settings
.no-animate
#js-cluster-details
{
class:
(
'expanded'
if
expanded
)
}
.settings-header
%h4
=
s_
(
'ClusterIntegration|Cluster details'
)
%button
.btn.js-settings-toggle
=
expanded
?
'Collapse'
:
'Expand'
%p
=
s_
(
'ClusterIntegration|See and edit the details for your cluster'
)
.settings-content
.no-animate
{
class:
(
'expanded'
if
expanded
)
}
.settings-content
.form_group.append-bottom-20
%label
.append-bottom-10
{
for:
'cluter-name'
}
...
...
@@ -66,11 +66,11 @@
%span
.input-group-addon.clipboard-addon
=
clipboard_button
(
text:
@cluster
.
gcp_cluster_name
,
title:
s_
(
'ClusterIntegration|Copy cluster name'
))
%section
.settings
#js-cluster-advanced-settings
%section
.settings
.no-animate
#js-cluster-advanced-settings
{
class:
(
'expanded'
if
expanded
)
}
.settings-header
%h4
=
_
(
'Advanced settings'
)
%button
.btn.js-settings-toggle
=
expanded
?
'Collapse'
:
'Expand'
%p
=
s_
(
'ClusterIntegration|Manage Cluster integration on your GitLab project'
)
.settings-content
.no-animate
{
class:
(
'expanded'
if
expanded
)
}
.settings-content
=
render
'advanced_settings'
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