diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 06:09:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 06:09:00 +0000 |
| commit | a496f41f60e12a0a5c31482b7594ad547e0ade42 (patch) | |
| tree | 2248f3ec4451bca9e5fca08c7761c846c5285b7f /app/views/projects | |
| parent | d393deba773bb1fab09273850fe5d5986066d76d (diff) | |
| download | gitlab-ce-a496f41f60e12a0a5c31482b7594ad547e0ade42.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/commit/_commit_box.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index d07407a6d13..88d1ec54cb0 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -66,13 +66,13 @@ - @commit.parents.each do |parent| = link_to parent.short_id, project_commit_path(@project, parent), class: "commit-sha" .commit-info.branches - %i.fa.fa-spinner.fa-spin + .spinner.vertical-align-middle .well-segment.merge-request-info .icon-container = custom_icon('mr_bold') %span.commit-info.merge-requests{ 'data-project-commit-path' => merge_requests_project_commit_path(@project, @commit.id, format: :json) } - = icon('spinner spin') + .spinner.vertical-align-middle - last_pipeline = @commit.last_pipeline - if can?(current_user, :read_pipeline, last_pipeline) |