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
750fbdb1
Commit
750fbdb1
authored
Jan 27, 2022
by
Alexander Turinske
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update cluster environment badge to pajamas
- update badge to pajamas Changelog: changed EE: true
parent
952a0852
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
ee/app/assets/javascripts/clusters/components/environments.vue
...p/assets/javascripts/clusters/components/environments.vue
+11
-2
ee/spec/frontend/clusters/components/environments_spec.js
ee/spec/frontend/clusters/components/environments_spec.js
+1
-1
No files found.
ee/app/assets/javascripts/clusters/components/environments.vue
View file @
750fbdb1
<
script
>
import
{
GlTable
,
GlEmptyState
,
GlLoadingIcon
,
GlIcon
,
GlLink
,
GlSprintf
}
from
'
@gitlab/ui
'
;
import
{
GlBadge
,
GlTable
,
GlEmptyState
,
GlLoadingIcon
,
GlIcon
,
GlLink
,
GlSprintf
,
}
from
'
@gitlab/ui
'
;
import
{
__
}
from
'
~/locale
'
;
import
deploymentInstance
from
'
~/vue_shared/components/deployment_instance.vue
'
;
import
TimeAgo
from
'
~/vue_shared/components/time_ago_tooltip.vue
'
;
export
default
{
components
:
{
GlBadge
,
GlEmptyState
,
GlTable
,
GlIcon
,
...
...
@@ -120,7 +129,7 @@ export default {
<!-- column: Pods in use -->
<
template
#head(rolloutStatus)=
"data"
>
{{
data
.
label
}}
<
span
class=
"badge badge-pill bold"
>
{{
podsInUseCount
}}
</span
>
{{
data
.
label
}}
<
gl-badge>
{{
podsInUseCount
}}
</gl-badge
>
</
template
>
<
template
#cell(rolloutStatus)=
"row"
>
...
...
ee/spec/frontend/clusters/components/environments_spec.js
View file @
750fbdb1
...
...
@@ -53,7 +53,7 @@ describe('Environments', () => {
});
it
(
'
renders the correct table headers
'
,
()
=>
{
const
tableHeaders
=
[
'
Project
'
,
'
Environment
'
,
'
Job
'
,
`Pods in use 2`
,
'
Last updated
'
];
const
tableHeaders
=
[
'
Project
'
,
'
Environment
'
,
'
Job
'
,
`Pods in use
2`
,
'
Last updated
'
];
const
headers
=
table
.
findAll
(
'
th
'
);
expect
(
headers
).
toHaveLength
(
tableHeaders
.
length
);
...
...
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