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
3f34a156
Commit
3f34a156
authored
Oct 01, 2020
by
Andrei Kyrnich
Committed by
Enrique Alcántara
Oct 01, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add GitLab UI button styles to app/views/projects/ci/builds/_build.html
parent
f207da68
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+5
-5
changelogs/unreleased/gitlab_buttons_ci_builds.yml
changelogs/unreleased/gitlab_buttons_ci_builds.yml
+5
-0
No files found.
app/views/projects/ci/builds/_build.html.haml
View file @
3f34a156
...
...
@@ -101,11 +101,11 @@
=
sprite_icon
(
'download'
)
-
if
can?
(
current_user
,
:update_build
,
job
)
-
if
job
.
active?
=
link_to
cancel_project_job_path
(
job
.
project
,
job
,
continue:
{
to:
request
.
fullpath
}),
method: :post
,
title:
_
(
'Cancel'
),
class:
'btn btn-build'
do
=
link_to
cancel_project_job_path
(
job
.
project
,
job
,
continue:
{
to:
request
.
fullpath
}),
method: :post
,
title:
_
(
'Cancel'
),
class:
'btn
gl-button
btn-build'
do
=
sprite_icon
(
'close'
)
-
elsif
job
.
scheduled?
.btn-group
.btn.btn-default
{
disabled:
true
}
.btn.
gl-button.
btn-default
{
disabled:
true
}
=
sprite_icon
(
'planning'
)
%time
.js-remaining-time
{
datetime:
job
.
scheduled_at
.
utc
.
iso8601
}
=
duration_in_numbers
(
job
.
execute_in
)
...
...
@@ -113,17 +113,17 @@
=
link_to
play_project_job_path
(
job
.
project
,
job
,
return_to:
request
.
original_url
),
method: :post
,
title:
s_
(
'DelayedJobs|Start now'
),
class:
'btn btn-default btn-build has-tooltip'
,
class:
'btn
gl-button
btn-default btn-build has-tooltip'
,
data:
{
confirm:
confirmation_message
}
do
=
sprite_icon
(
'play'
)
=
link_to
unschedule_project_job_path
(
job
.
project
,
job
,
return_to:
request
.
original_url
),
method: :post
,
title:
s_
(
'DelayedJobs|Unschedule'
),
class:
'btn btn-default btn-build has-tooltip'
do
class:
'btn
gl-button
btn-default btn-build has-tooltip'
do
=
sprite_icon
(
'time-out'
)
-
elsif
allow_retry
-
if
job
.
playable?
&&
!
admin
&&
can?
(
current_user
,
:update_build
,
job
)
=
link_to
play_project_job_path
(
job
.
project
,
job
,
return_to:
request
.
original_url
),
method: :post
,
title:
_
(
'Play'
),
class:
'btn btn-build'
do
=
link_to
play_project_job_path
(
job
.
project
,
job
,
return_to:
request
.
original_url
),
method: :post
,
title:
_
(
'Play'
),
class:
'btn
gl-button
btn-build'
do
=
custom_icon
(
'icon_play'
)
-
elsif
job
.
retryable?
=
link_to
retry_project_job_path
(
job
.
project
,
job
,
return_to:
request
.
original_url
),
method: :post
,
title:
_
(
'Retry'
),
class:
'btn btn-build gl-button btn-icon btn-default'
do
...
...
changelogs/unreleased/gitlab_buttons_ci_builds.yml
0 → 100644
View file @
3f34a156
---
title
:
Apply GitLab UI button styles to HAML buttons app/views/projects/ci/builds
merge_request
:
43728
author
:
Andrei Kyrnich @kyrnich
type
:
other
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