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
de4d9a9e
Commit
de4d9a9e
authored
Jan 14, 2021
by
Veethika Mishra
Committed by
Mike Greiling
Jan 14, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate the bs-callout class to gl-alert in ancestor notice
parent
6a0199bd
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
20 deletions
+19
-20
app/assets/javascripts/clusters_list/components/ancestor_notice.vue
.../javascripts/clusters_list/components/ancestor_notice.vue
+17
-18
spec/frontend/clusters_list/components/ancestor_notice_spec.js
...frontend/clusters_list/components/ancestor_notice_spec.js
+2
-2
No files found.
app/assets/javascripts/clusters_list/components/ancestor_notice.vue
View file @
de4d9a9e
<
script
>
<
script
>
import
{
GlLink
,
GlSprintf
}
from
'
@gitlab/ui
'
;
import
{
GlLink
,
GlSprintf
,
GlAlert
}
from
'
@gitlab/ui
'
;
import
{
mapState
}
from
'
vuex
'
;
import
{
mapState
}
from
'
vuex
'
;
export
default
{
export
default
{
components
:
{
components
:
{
GlLink
,
GlLink
,
GlSprintf
,
GlSprintf
,
GlAlert
,
},
},
computed
:
{
computed
:
{
...
mapState
([
'
ancestorHelperPath
'
,
'
hasAncestorClusters
'
]),
...
mapState
([
'
ancestorHelperPath
'
,
'
hasAncestorClusters
'
]),
...
@@ -14,8 +15,7 @@ export default {
...
@@ -14,8 +15,7 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<div
v-if=
"hasAncestorClusters"
class=
"bs-callout bs-callout-info"
>
<gl-alert
v-if=
"hasAncestorClusters"
variant=
"info"
:dismissible=
"false"
class=
"gl-my-4"
>
<p>
<gl-sprintf
<gl-sprintf
:message=
"
:message=
"
s__(
s__(
...
@@ -29,6 +29,5 @@ export default {
...
@@ -29,6 +29,5 @@ export default {
</gl-link>
</gl-link>
</
template
>
</
template
>
</gl-sprintf>
</gl-sprintf>
</p>
</gl-alert>
</div>
</template>
</template>
spec/frontend/clusters_list/components/ancestor_notice_spec.js
View file @
de4d9a9e
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
GlLink
,
GlSprintf
}
from
'
@gitlab/ui
'
;
import
{
GlLink
,
GlSprintf
,
GlAlert
}
from
'
@gitlab/ui
'
;
import
AncestorNotice
from
'
~/clusters_list/components/ancestor_notice.vue
'
;
import
AncestorNotice
from
'
~/clusters_list/components/ancestor_notice.vue
'
;
import
ClusterStore
from
'
~/clusters_list/store
'
;
import
ClusterStore
from
'
~/clusters_list/store
'
;
...
@@ -9,7 +9,7 @@ describe('ClustersAncestorNotice', () => {
...
@@ -9,7 +9,7 @@ describe('ClustersAncestorNotice', () => {
const
createWrapper
=
()
=>
{
const
createWrapper
=
()
=>
{
store
=
ClusterStore
({
ancestorHelperPath
:
'
/some/ancestor/path
'
});
store
=
ClusterStore
({
ancestorHelperPath
:
'
/some/ancestor/path
'
});
wrapper
=
shallowMount
(
AncestorNotice
,
{
store
,
stubs
:
{
GlSprintf
}
});
wrapper
=
shallowMount
(
AncestorNotice
,
{
store
,
stubs
:
{
GlSprintf
,
GlAlert
}
});
return
wrapper
.
vm
.
$nextTick
();
return
wrapper
.
vm
.
$nextTick
();
};
};
...
...
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