diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-23 15:09:28 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-23 15:09:28 +0000 |
| commit | 14fb5a922285d71fea67de59164ee4bb81ee3486 (patch) | |
| tree | d3f585c54feb676aec2f14cc85fe32d615fd7fc0 /app/views/projects | |
| parent | d9b0b3243e3cd71a08ff5d4035b7882cc7a5a35f (diff) | |
| download | gitlab-ce-14fb5a922285d71fea67de59164ee4bb81ee3486.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/ci/builds/_build.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/pipelines/_with_tabs.html.haml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index 4c20ac84b24..250abd7fc08 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -126,5 +126,5 @@ = link_to play_project_job_path(job.project, job, return_to: request.original_url), method: :post, title: _('Play'), class: 'btn 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' do - = icon('repeat') + = 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') diff --git a/app/views/projects/pipelines/_with_tabs.html.haml b/app/views/projects/pipelines/_with_tabs.html.haml index ee849fd34c7..a86451b2022 100644 --- a/app/views/projects/pipelines/_with_tabs.html.haml +++ b/app/views/projects/pipelines/_with_tabs.html.haml @@ -71,8 +71,8 @@ = build.present.callout_failure_message %td.responsive-table-cell.build-actions - if can?(current_user, :update_build, job) - = link_to retry_project_job_path(build.project, build, return_to: request.original_url), method: :post, title: _('Retry'), class: 'btn btn-build' do - = icon('repeat') + = link_to retry_project_job_path(build.project, build, 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') - if can?(current_user, :read_build, job) %tr.build-trace-row.responsive-table-border-end %td |