Commit cab0468e authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 9f0751e9 21924bc7
...@@ -78,11 +78,11 @@ export default { ...@@ -78,11 +78,11 @@ export default {
<gl-button <gl-button
:class="{ disabled: isActionDisabled(action) }" :class="{ disabled: isActionDisabled(action) }"
:disabled="isActionDisabled(action)" :disabled="isActionDisabled(action)"
class="js-pipeline-action-link no-btn btn" class="js-pipeline-action-link no-btn btn d-flex align-items-center justify-content-between flex-wrap"
@click="onClickAction(action)" @click="onClickAction(action)"
> >
{{ action.name }} {{ action.name }}
<span v-if="action.scheduled_at" class="pull-right"> <span v-if="action.scheduled_at">
<icon name="clock" /> <icon name="clock" />
<gl-countdown :end-date-string="action.scheduled_at" /> <gl-countdown :end-date-string="action.scheduled_at" />
</span> </span>
......
---
title: 'Timer and action name aligned vertically for delayed jobs in pipeline actions'
merge_request: 25117
author: Gokhan Apaydin
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment