diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-05 12:09:10 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-05 12:09:10 +0300 |
commit | 315243f87739dd1edda2b75361f826abc91d4069 (patch) | |
tree | f72b9e0c3e79e263687ea8d127a3e78bde9d8760 /app/views/projects/ci | |
parent | 1c4f17276df2af5a6c205c2a3ceec907751edf68 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/ci')
-rw-r--r-- | app/views/projects/ci/builds/_build.html.haml | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index b7a265c0b17..0cc595de7be 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -98,35 +98,35 @@ %td .gl-display-flex - - if can?(current_user, :read_job_artifacts, job) && job.artifacts? - = link_to download_project_job_artifacts_path(job.project, job), rel: 'nofollow', download: '', title: _('Download artifacts'), class: 'btn btn-build btn-default gl-button btn-icon btn-svg' do - = 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 gl-button btn-build btn-default' do - = sprite_icon('close') - - elsif job.scheduled? - .btn-group - .btn.gl-button.btn-default{ disabled: true } - = sprite_icon('planning') + .btn-group + - if can?(current_user, :read_job_artifacts, job) && job.artifacts? + = link_to download_project_job_artifacts_path(job.project, job), rel: 'nofollow', download: '', title: _('Download artifacts'), class: 'gl-button btn btn-default btn-icon' do + = sprite_icon('download', css_class: 'gl-icon') + - 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: 'gl-button btn btn-default btn-icon' do + = sprite_icon('close', css_class: 'gl-icon') + - elsif job.scheduled? + .gl-button.btn.btn-default.btn-icon.disabled{ disabled: true } + = sprite_icon('planning', css_class: 'gl-icon') %time.js-remaining-time{ datetime: job.scheduled_at.utc.iso8601 } = duration_in_numbers(job.execute_in) - confirmation_message = s_("DelayedJobs|Are you sure you want to run %{job_name} immediately? This job will run automatically after it's timer finishes.") % { job_name: job.name } = link_to play_project_job_path(job.project, job, return_to: request.original_url), method: :post, title: s_('DelayedJobs|Start now'), - class: 'btn gl-button btn-default btn-build has-tooltip', + class: 'gl-button btn btn-default btn-icon has-tooltip', data: { confirm: confirmation_message } do - = sprite_icon('play') + = sprite_icon('play', css_class: 'gl-icon') = link_to unschedule_project_job_path(job.project, job, return_to: request.original_url), method: :post, title: s_('DelayedJobs|Unschedule'), - 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 gl-button btn-build btn-default' 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 - = sprite_icon('repeat', css_class: 'gl-icon') + class: 'gl-button btn btn-default btn-icon has-tooltip' do + = sprite_icon('time-out', css_class: 'gl-icon') + - 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: 'gl-button btn btn-default btn-icon' do + = sprite_icon('play', css_class: 'gl-icon') + - elsif job.retryable? + = link_to retry_project_job_path(job.project, job, return_to: request.original_url), method: :post, title: _('Retry'), class: 'gl-button btn btn-default btn-icon' do + = sprite_icon('repeat', css_class: 'gl-icon') |