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
915dfd8e
Commit
915dfd8e
authored
Apr 13, 2021
by
pburdette
Committed by
Payton Burdette
Apr 13, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove div element
Remove extra div element that is not needed.
parent
61693a6b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
38 deletions
+30
-38
app/assets/javascripts/pipelines/components/pipelines_list/time_ago.vue
...ascripts/pipelines/components/pipelines_list/time_ago.vue
+30
-38
No files found.
app/assets/javascripts/pipelines/components/pipelines_list/time_ago.vue
View file @
915dfd8e
...
...
@@ -59,47 +59,39 @@ export default {
</
script
>
<
template
>
<div>
<div>
<span
v-if=
"showInProgress"
data-testid=
"pipeline-in-progress"
>
<gl-icon
v-if=
"stuck"
name=
"warning"
class=
"gl-mr-2"
:size=
"12"
data-testid=
"warning-icon"
/>
<gl-icon
v-else
name=
"hourglass"
class=
"gl-vertical-align-baseline! gl-mr-2"
:size=
"12"
data-testid=
"hourglass-icon"
/>
{{
s__
(
'
Pipeline|In progress
'
)
}}
</span>
<span
v-if=
"showInProgress"
data-testid=
"pipeline-in-progress"
>
<gl-icon
v-if=
"stuck"
name=
"warning"
class=
"gl-mr-2"
:size=
"12"
data-testid=
"warning-icon"
/>
<gl-icon
v-else
name=
"hourglass"
class=
"gl-vertical-align-baseline! gl-mr-2"
:size=
"12"
data-testid=
"hourglass-icon"
/>
{{
s__
(
'
Pipeline|In progress
'
)
}}
</span>
<span
v-if=
"showSkipped"
data-testid=
"pipeline-skipped"
>
<gl-icon
name=
"status_skipped_borderless"
class=
"gl-mr-2"
:size=
"16"
/>
{{
s__
(
'
Pipeline|Skipped
'
)
}}
</span>
<span
v-if=
"showSkipped"
data-testid=
"pipeline-skipped"
>
<gl-icon
name=
"status_skipped_borderless"
class=
"gl-mr-2"
:size=
"16"
/>
{{
s__
(
'
Pipeline|Skipped
'
)
}}
</span>
<p
v-if=
"duration"
class=
"duration"
>
<gl-icon
name=
"timer"
class=
"gl-vertical-align-baseline!"
:size=
"12"
/>
{{
durationFormatted
}}
</p>
<p
v-if=
"duration"
class=
"duration"
>
<gl-icon
name=
"timer"
class=
"gl-vertical-align-baseline!"
:size=
"12"
/>
{{
durationFormatted
}}
</p>
<p
v-if=
"finishedTime"
class=
"finished-at d-none d-md-block"
>
<gl-icon
name=
"calendar"
class=
"gl-vertical-align-baseline!"
:size=
"12"
/>
<p
v-if=
"finishedTime"
class=
"finished-at d-none d-md-block"
>
<gl-icon
name=
"calendar"
class=
"gl-vertical-align-baseline!"
:size=
"12"
/>
<time
v-gl-tooltip
:title=
"tooltipTitle(finishedTime)"
data-placement=
"top"
data-container=
"body"
>
{{
timeFormatted
(
finishedTime
)
}}
</time>
</p>
</div>
<time
v-gl-tooltip
:title=
"tooltipTitle(finishedTime)"
data-placement=
"top"
data-container=
"body"
>
{{
timeFormatted
(
finishedTime
)
}}
</time>
</p>
</div>
</
template
>
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