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
db23496b
Commit
db23496b
authored
Sep 09, 2020
by
Kev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace v-safe-html with gl-icon in time_ago
parent
480103e8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
app/assets/javascripts/pipelines/components/pipelines_list/time_ago.vue
...ascripts/pipelines/components/pipelines_list/time_ago.vue
+5
-4
No files found.
app/assets/javascripts/pipelines/components/pipelines_list/time_ago.vue
View file @
db23496b
<
script
>
import
{
Gl
SafeHtmlDirective
as
SafeHtml
}
from
'
@gitlab/ui
'
;
import
{
Gl
Icon
}
from
'
@gitlab/ui
'
;
import
iconTimerSvg
from
'
icons/_icon_timer.svg
'
;
import
'
~/lib/utils/datetime_utility
'
;
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
...
...
@@ -8,8 +8,8 @@ import timeagoMixin from '~/vue_shared/mixins/timeago';
export
default
{
directives
:
{
tooltip
,
SafeHtml
,
},
components
:
{
GlIcon
},
mixins
:
[
timeagoMixin
],
props
:
{
finishedTime
:
{
...
...
@@ -61,11 +61,12 @@ export default {
<div
class=
"table-mobile-header"
role=
"rowheader"
>
{{
s__
(
'
Pipeline|Duration
'
)
}}
</div>
<div
class=
"table-mobile-content"
>
<p
v-if=
"hasDuration"
class=
"duration"
>
<span
v-safe-html=
"iconTimerSvg"
>
</span>
{{
durationFormatted
}}
<gl-icon
name=
"timer"
class=
"gl-vertical-align-baseline!"
aria-hidden=
"true"
/>
{{
durationFormatted
}}
</p>
<p
v-if=
"hasFinishedTime"
class=
"finished-at d-none d-sm-none d-md-block"
>
<
i
class=
"fa fa-calendar"
aria-hidden=
"true"
>
</i
>
<
gl-icon
name=
"calendar"
class=
"gl-vertical-align-baseline!"
aria-hidden=
"true"
/
>
<time
v-tooltip
...
...
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