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
6947646d
Commit
6947646d
authored
Nov 03, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Ingress to cluster applications section
parent
797e758b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
app/assets/javascripts/clusters/components/applications.vue
app/assets/javascripts/clusters/components/applications.vue
+10
-1
app/assets/stylesheets/pages/clusters.scss
app/assets/stylesheets/pages/clusters.scss
+1
-1
spec/javascripts/clusters/components/applications_spec.js
spec/javascripts/clusters/components/applications_spec.js
+1
-1
No files found.
app/assets/javascripts/clusters/components/applications.vue
View file @
6947646d
...
...
@@ -95,9 +95,18 @@ export default {
:status-reason=
"applications.helm.statusReason"
:request-status=
"applications.helm.requestStatus"
:request-reason=
"applications.helm.requestReason"
/>
<application-row
id=
"ingress"
:title=
"applications.ingress.title"
title-link=
"https://kubernetes.io/docs/concepts/services-networking/ingress/"
:description=
"ingressDescription"
:status=
"applications.ingress.status"
:status-reason=
"applications.ingress.statusReason"
:request-status=
"applications.ingress.requestStatus"
:request-reason=
"applications.ingress.requestReason"
/>
<!-- NOTE: Don't forget to update `clusters.scss` min-height for this block and uncomment `application_spec` tests -->
<!-- Add Ingress row, all other plumbing is complete -->
<!-- Add GitLab Runner row, all other plumbing is complete -->
</div>
</div>
...
...
app/assets/stylesheets/pages/clusters.scss
View file @
6947646d
...
...
@@ -6,5 +6,5 @@
.cluster-applications-table
{
// Wait for the Vue to kick-in and render the applications block
min-height
:
179
px
;
min-height
:
302
px
;
}
spec/javascripts/clusters/components/applications_spec.js
View file @
6947646d
...
...
@@ -29,11 +29,11 @@ describe('Applications', () => {
expect
(
vm
.
$el
.
querySelector
(
'
.js-cluster-application-row-helm
'
)).
toBeDefined
();
});
/* * /
it
(
'
renders a row for Ingress
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-cluster-application-row-ingress
'
)).
toBeDefined
();
});
/* * /
it('renders a row for GitLab Runner', () => {
expect(vm.$el.querySelector('.js-cluster-application-row-runner')).toBeDefined();
});
...
...
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