Commit ba4c2b16 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch 'dimitrieh-master-patch-55257' into 'master'

Replace fa-link icons with GitLab SVG link icon

Closes #225901

See merge request gitlab-org/gitlab!36973
parents bff3d12c 7e2033c1
- page_title _("Blame"), @blob.path, @ref
- link_icon = icon("link")
- link_icon = sprite_icon("link", size: 12)
#blob-content-holder.tree-holder
= render "projects/blob/breadcrumb", blob: @blob, blame: true
......
.file-content.code.js-syntax-highlight
.line-numbers
- if blob.data.present?
- link_icon = icon('link')
- link_icon = sprite_icon('link', size: 12)
- link = blob_link if defined?(blob_link)
- blob.data.each_line.each_with_index do |_, index|
- offset = defined?(first_line_number) ? first_line_number : 1
......
---
title: Replace fa-link icons with GitLab SVG link icon
merge_request: 36973
author:
type: other
......@@ -50,7 +50,7 @@ RSpec.describe 'Blob button line permalinks (BlobLinePermalinkUpdater)', :js do
visit_blob
find("##{ending_fragment}").hover
find("##{ending_fragment} i").click
find("##{ending_fragment} svg").click
expect(find('.js-data-file-blob-permalink-url')['href']).to eq(get_absolute_url(project_blob_path(project, tree_join(sha, path), anchor: ending_fragment)))
end
......@@ -100,7 +100,7 @@ RSpec.describe 'Blob button line permalinks (BlobLinePermalinkUpdater)', :js do
visit_blob
find("##{ending_fragment}").hover
find("##{ending_fragment} i").click
find("##{ending_fragment} svg").click
expect(find('.js-blob-blame-link')['href']).to eq(get_absolute_url(project_blame_path(project, tree_join('master', path), anchor: ending_fragment)))
end
......
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