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
05214682
Commit
05214682
authored
Dec 15, 2020
by
Gary Bell
Committed by
Kushal Pandya
Dec 15, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate bs-callout to GlAlert in clusters components
parent
cd3242a8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
9 deletions
+15
-9
app/assets/javascripts/clusters/components/applications.vue
app/assets/javascripts/clusters/components/applications.vue
+8
-7
changelogs/unreleased/242022-bscallout-to-glalert-applications.yml
...s/unreleased/242022-bscallout-to-glalert-applications.yml
+5
-0
spec/frontend/clusters/components/__snapshots__/applications_spec.js.snap
...usters/components/__snapshots__/applications_spec.js.snap
+2
-2
No files found.
app/assets/javascripts/clusters/components/applications.vue
View file @
05214682
<
script
>
import
{
GlLoadingIcon
,
GlSprintf
,
GlLink
}
from
'
@gitlab/ui
'
;
import
{
GlLoadingIcon
,
GlSprintf
,
GlLink
,
GlAlert
}
from
'
@gitlab/ui
'
;
import
gitlabLogo
from
'
images/cluster_app_logos/gitlab.png
'
;
import
helmLogo
from
'
images/cluster_app_logos/helm.png
'
;
import
jupyterhubLogo
from
'
images/cluster_app_logos/jupyterhub.png
'
;
...
...
@@ -30,6 +30,7 @@ export default {
CrossplaneProviderStack
,
IngressModsecuritySettings
,
FluentdOutputSettings
,
GlAlert
,
},
props
:
{
type
:
{
...
...
@@ -293,8 +294,8 @@ export default {
</p>
</template>
<
template
v-else
>
<
div
class=
"bs-callout bs-callout-info
"
>
<s
trong
data-testid=
"ingressCostWarning"
>
<
gl-alert
variant=
"info"
:dismissible=
"false
"
>
<s
pan
data-testid=
"ingressCostWarning"
>
<gl-sprintf
:message=
"
s__(
...
...
@@ -308,8 +309,8 @@ export default {
}}
</gl-link>
</
template
>
</gl-sprintf>
</s
trong
>
</
div
>
</s
pan
>
</
gl-alert
>
</template>
</template>
</application-row>
...
...
@@ -572,13 +573,13 @@ export default {
title-link=
"https://github.com/knative/docs"
>
<
template
#description
>
<
p
v-if=
"!rbac"
class=
"rbac-notice bs-callout bs-callout-info
"
>
<
gl-alert
v-if=
"!rbac"
variant=
"info"
class=
"rbac-notice gl-my-3"
:dismissible=
"false
"
>
{{
s__
(
`ClusterIntegration|You must have an RBAC-enabled cluster
to install Knative.`
)
}}
<gl-link
:href=
"helpPath"
target=
"_blank"
>
{{
__
(
'
More information
'
)
}}
</gl-link>
</
p
>
</
gl-alert
>
<p>
{{
s__
(
`ClusterIntegration|Knative extends Kubernetes to provide
...
...
changelogs/unreleased/242022-bscallout-to-glalert-applications.yml
0 → 100644
View file @
05214682
---
title
:
Replaces elements with the bs-callout class with gl-alert vue component
merge_request
:
47331
author
:
Gary Bell @garybell
type
:
other
spec/frontend/clusters/components/__snapshots__/applications_spec.js.snap
View file @
05214682
...
...
@@ -55,7 +55,7 @@ exports[`Applications Crossplane application shows the correct description 1`] =
`;
exports[`Applications Ingress application shows the correct warning message 1`] = `
<s
trong
<s
pan
data-testid="ingressCostWarning"
>
Installing Ingress may incur additional costs. Learn more about
...
...
@@ -68,7 +68,7 @@ exports[`Applications Ingress application shows the correct warning message 1`]
pricing
</a>
.
</s
trong
>
</s
pan
>
`;
exports[`Applications Knative application shows the correct description 1`] = `
...
...
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