Skip to content
代码片段 群组 项目
提交 e751f68c 编辑于 作者: Vitaly Slobodin's avatar Vitaly Slobodin
浏览文件

Merge branch 'jobs-list-update-created-by' into 'master'

No related branches found
No related tags found
无相关合并请求
...@@ -27,6 +27,9 @@ export default { ...@@ -27,6 +27,9 @@ export default {
durationFormatted() { durationFormatted() {
return formatTime(this.duration * 1000); return formatTime(this.duration * 1000);
}, },
hasDurationAndFinishedTime() {
return this.finishedTime && this.duration;
},
}, },
}; };
</script> </script>
...@@ -37,7 +40,11 @@ export default { ...@@ -37,7 +40,11 @@ export default {
<gl-icon name="timer" :size="$options.iconSize" data-testid="duration-icon" /> <gl-icon name="timer" :size="$options.iconSize" data-testid="duration-icon" />
{{ durationFormatted }} {{ durationFormatted }}
</div> </div>
<div v-if="finishedTime" data-testid="job-finished-time"> <div
v-if="finishedTime"
:class="{ 'gl-mt-2': hasDurationAndFinishedTime }"
data-testid="job-finished-time"
>
<gl-icon name="calendar" :size="$options.iconSize" data-testid="finished-time-icon" /> <gl-icon name="calendar" :size="$options.iconSize" data-testid="finished-time-icon" />
<time-ago-tooltip :time="finishedTime" /> <time-ago-tooltip :time="finishedTime" />
</div> </div>
......
...@@ -41,7 +41,7 @@ export default { ...@@ -41,7 +41,7 @@ export default {
{{ pipelineId }} {{ pipelineId }}
</gl-link> </gl-link>
</div> </div>
<div> <div class="gl-font-sm gl-text-secondary gl-mt-2">
<span>{{ __('created by') }}</span> <span>{{ __('created by') }}</span>
<gl-link v-if="showAvatar" :href="userPath" data-testid="pipeline-user-link"> <gl-link v-if="showAvatar" :href="userPath" data-testid="pipeline-user-link">
<gl-avatar :src="pipelineUserAvatar" :size="16" /> <gl-avatar :src="pipelineUserAvatar" :size="16" />
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册