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
cab0468e
Commit
cab0468e
authored
Feb 22, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
9f0751e9
21924bc7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
app/assets/javascripts/pipelines/components/pipelines_actions.vue
...ts/javascripts/pipelines/components/pipelines_actions.vue
+2
-2
changelogs/unreleased/52198-timer-is-vertically-misaligned-for-delayed-jobs-in-pipeline-actions.yml
...cally-misaligned-for-delayed-jobs-in-pipeline-actions.yml
+5
-0
No files found.
app/assets/javascripts/pipelines/components/pipelines_actions.vue
View file @
cab0468e
...
@@ -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>
...
...
changelogs/unreleased/52198-timer-is-vertically-misaligned-for-delayed-jobs-in-pipeline-actions.yml
0 → 100644
View file @
cab0468e
---
title
:
'
Timer
and
action
name
aligned
vertically
for
delayed
jobs
in
pipeline
actions'
merge_request
:
25117
author
:
Gokhan Apaydin
type
:
fixed
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