Commit 098b9910 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '202234-migrating-spinner-whithin-commit' into 'master'

Resolve "Migrate '.fa-spinner' to '.spinner' within 'app/views/projects/commit'"

Closes #202234

See merge request gitlab-org/gitlab!25756
parents aac80fde 209aac1b
...@@ -66,13 +66,13 @@ ...@@ -66,13 +66,13 @@
- @commit.parents.each do |parent| - @commit.parents.each do |parent|
= link_to parent.short_id, project_commit_path(@project, parent), class: "commit-sha" = link_to parent.short_id, project_commit_path(@project, parent), class: "commit-sha"
.commit-info.branches .commit-info.branches
%i.fa.fa-spinner.fa-spin .spinner.vertical-align-middle
.well-segment.merge-request-info .well-segment.merge-request-info
.icon-container .icon-container
= custom_icon('mr_bold') = custom_icon('mr_bold')
%span.commit-info.merge-requests{ 'data-project-commit-path' => merge_requests_project_commit_path(@project, @commit.id, format: :json) } %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 - last_pipeline = @commit.last_pipeline
- if can?(current_user, :read_pipeline, last_pipeline) - if can?(current_user, :read_pipeline, last_pipeline)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment