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
ced9b0bd
Commit
ced9b0bd
authored
Aug 10, 2020
by
Gilang Gumilar
Committed by
Olena Horal-Koretska
Aug 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace v-popover directive with GlPopover in pipeline_url.vue
parent
0f56fcb5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
33 deletions
+38
-33
app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue
...ipts/pipelines/components/pipelines_list/pipeline_url.vue
+33
-33
changelogs/unreleased/227240-replace-v-popover-with-gl-popover-in-pipeline_url-vue.yml
...replace-v-popover-with-gl-popover-in-pipeline_url-vue.yml
+5
-0
No files found.
app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue
View file @
ced9b0bd
<
script
>
<
script
>
import
{
GlLink
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
GlLink
,
GlPopover
,
GlSprintf
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
escape
}
from
'
lodash
'
;
import
{
SCHEDULE_ORIGIN
}
from
'
../../constants
'
;
import
{
SCHEDULE_ORIGIN
}
from
'
../../constants
'
;
import
{
__
,
sprintf
}
from
'
~/locale
'
;
import
popover
from
'
~/vue_shared/directives/popover
'
;
const
popoverTitle
=
sprintf
(
escape
(
__
(
`This pipeline makes use of a predefined CI/CD configuration enabled by %{strongStart}Auto DevOps.%{strongEnd}`
,
),
),
{
strongStart
:
'
<b>
'
,
strongEnd
:
'
</b>
'
},
false
,
);
export
default
{
export
default
{
components
:
{
components
:
{
GlLink
,
GlLink
,
GlPopover
,
GlSprintf
,
},
},
directives
:
{
directives
:
{
GlTooltip
:
GlTooltipDirective
,
GlTooltip
:
GlTooltipDirective
,
popover
,
},
},
props
:
{
props
:
{
pipeline
:
{
pipeline
:
{
...
@@ -44,23 +32,6 @@ export default {
...
@@ -44,23 +32,6 @@ export default {
isScheduled
()
{
isScheduled
()
{
return
this
.
pipeline
.
source
===
SCHEDULE_ORIGIN
;
return
this
.
pipeline
.
source
===
SCHEDULE_ORIGIN
;
},
},
popoverOptions
()
{
return
{
html
:
true
,
trigger
:
'
focus
'
,
placement
:
'
top
'
,
title
:
`<div class="autodevops-title">
${
popoverTitle
}
</div>`
,
content
:
`<a
class="autodevops-link"
href="
${
this
.
autoDevopsHelpPath
}
"
target="_blank"
rel="noopener noreferrer nofollow">
${
escape
(
__
(
'
Learn more about Auto DevOps
'
))}
</a>`
,
};
},
},
},
};
};
</
script
>
</
script
>
...
@@ -114,13 +85,42 @@ export default {
...
@@ -114,13 +85,42 @@ export default {
</span>
</span>
<gl-link
<gl-link
v-if=
"pipeline.flags.auto_devops"
v-if=
"pipeline.flags.auto_devops"
v-popover=
"popoverOptions
"
:id=
"`pipeline-url-autodevops-$
{pipeline.id}`
"
tabindex="0"
tabindex="0"
class="js-pipeline-url-autodevops badge badge-info autodevops-badge"
class="js-pipeline-url-autodevops badge badge-info autodevops-badge"
data-testid="pipeline-url-autodevops"
data-testid="pipeline-url-autodevops"
role="button"
role="button"
>
{{
__
(
'
Auto DevOps
'
)
}}
</gl-link
>
{{
__
(
'
Auto DevOps
'
)
}}
</gl-link
>
>
<gl-popover
:target=
"`pipeline-url-autodevops-$
{pipeline.id}`"
triggers="focus"
placement="top"
>
<template
#title
>
<div
class=
"autodevops-title"
>
<gl-sprintf
:message=
"
__(
'This pipeline makes use of a predefined CI/CD configuration enabled by %
{strongStart}Auto DevOps.%{strongEnd}',
)
"
>
<template
#strong
="
{content}">
<b>
{{
content
}}
</b>
</
template
>
</gl-sprintf>
</div>
</template>
<gl-link
class=
"autodevops-link"
:href=
"autoDevopsHelpPath"
target=
"_blank"
rel=
"noopener noreferrer nofollow"
>
{{ __('Learn more about Auto DevOps') }}
</gl-link>
</gl-popover>
<span
<span
v-if=
"pipeline.flags.stuck"
v-if=
"pipeline.flags.stuck"
class=
"js-pipeline-url-stuck badge badge-warning"
class=
"js-pipeline-url-stuck badge badge-warning"
...
...
changelogs/unreleased/227240-replace-v-popover-with-gl-popover-in-pipeline_url-vue.yml
0 → 100644
View file @
ced9b0bd
---
title
:
Replace v-popover directive with GlPopover in ./app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue.vue
merge_request
:
38769
author
:
Gilang Gumilar
type
:
changed
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