Commit 391b1076 authored by Miguel Rincon's avatar Miguel Rincon

Merge branch '225948-replace-fa-info-circle-icons-with-gitlab-svg-information-icon' into 'master'

Replace fa-info-circle icons with GitLab SVG information-o icon

Closes #225948

See merge request gitlab-org/gitlab!41721
parents a18bb954 5817403f
- if @merge_request_diff && different_base?(@start_version, @merge_request_diff)
.mr-version-controls
.content-block
= icon('info-circle')
= sprite_icon('information-o')
Selected versions have different base commits.
Changes will include
= link_to project_compare_path(@project, from: @start_version.base_commit_sha, to: @merge_request_diff.base_commit_sha) do
......
- if @commit || @start_version || (@merge_request_diff && !@merge_request_diff.latest?)
.mr-version-controls
.content-block.comments-disabled-notif.clearfix
= icon('info-circle')
= sprite_icon('information-o')
= succeed '.' do
- if @commit
Only comments from the following commit are shown below
......
......@@ -46,7 +46,7 @@
- if @merge_request_to_resolve_discussions_of
.form-group.row
.col-sm-10.offset-sm-2
= icon('info-circle')
= sprite_icon('information-o')
- if @merge_request_to_resolve_discussions_of.discussions_can_be_resolved_by?(current_user)
= hidden_field_tag 'merge_request_to_resolve_discussions_of', @merge_request_to_resolve_discussions_of.iid
- if @discussion_to_resolve
......
---
title: Replace fa-info-circle icons with GitLab SVG information-o icon
merge_request: 41721
author:
type: changed
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