Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
7e2033c1
Commit
7e2033c1
authored
Jul 15, 2020
by
Dimitrie Hoekstra
Committed by
Dimitrie Hoekstra
Jul 22, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace fa-link icons with GitLab SVG link icon
parent
38640295
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
4 deletions
+9
-4
app/views/projects/blame/show.html.haml
app/views/projects/blame/show.html.haml
+1
-1
app/views/shared/_file_highlight.html.haml
app/views/shared/_file_highlight.html.haml
+1
-1
changelogs/unreleased/dimitrieh-master-patch-55257.yml
changelogs/unreleased/dimitrieh-master-patch-55257.yml
+5
-0
spec/features/projects/blobs/blob_line_permalink_updater_spec.rb
...atures/projects/blobs/blob_line_permalink_updater_spec.rb
+2
-2
No files found.
app/views/projects/blame/show.html.haml
View file @
7e2033c1
-
page_title
_
(
"Blame"
),
@blob
.
path
,
@ref
-
page_title
_
(
"Blame"
),
@blob
.
path
,
@ref
-
link_icon
=
icon
(
"link"
)
-
link_icon
=
sprite_icon
(
"link"
,
size:
12
)
#blob-content-holder
.tree-holder
#blob-content-holder
.tree-holder
=
render
"projects/blob/breadcrumb"
,
blob:
@blob
,
blame:
true
=
render
"projects/blob/breadcrumb"
,
blob:
@blob
,
blame:
true
...
...
app/views/shared/_file_highlight.html.haml
View file @
7e2033c1
.file-content.code.js-syntax-highlight
.file-content.code.js-syntax-highlight
.line-numbers
.line-numbers
-
if
blob
.
data
.
present?
-
if
blob
.
data
.
present?
-
link_icon
=
icon
(
'link'
)
-
link_icon
=
sprite_icon
(
'link'
,
size:
12
)
-
link
=
blob_link
if
defined?
(
blob_link
)
-
link
=
blob_link
if
defined?
(
blob_link
)
-
blob
.
data
.
each_line
.
each_with_index
do
|
_
,
index
|
-
blob
.
data
.
each_line
.
each_with_index
do
|
_
,
index
|
-
offset
=
defined?
(
first_line_number
)
?
first_line_number
:
1
-
offset
=
defined?
(
first_line_number
)
?
first_line_number
:
1
...
...
changelogs/unreleased/dimitrieh-master-patch-55257.yml
0 → 100644
View file @
7e2033c1
---
title
:
Replace fa-link icons with GitLab SVG link icon
merge_request
:
36973
author
:
type
:
other
spec/features/projects/blobs/blob_line_permalink_updater_spec.rb
View file @
7e2033c1
...
@@ -50,7 +50,7 @@ RSpec.describe 'Blob button line permalinks (BlobLinePermalinkUpdater)', :js do
...
@@ -50,7 +50,7 @@ RSpec.describe 'Blob button line permalinks (BlobLinePermalinkUpdater)', :js do
visit_blob
visit_blob
find
(
"#
#{
ending_fragment
}
"
).
hover
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
)))
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
end
...
@@ -100,7 +100,7 @@ RSpec.describe 'Blob button line permalinks (BlobLinePermalinkUpdater)', :js do
...
@@ -100,7 +100,7 @@ RSpec.describe 'Blob button line permalinks (BlobLinePermalinkUpdater)', :js do
visit_blob
visit_blob
find
(
"#
#{
ending_fragment
}
"
).
hover
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
)))
expect
(
find
(
'.js-blob-blame-link'
)[
'href'
]).
to
eq
(
get_absolute_url
(
project_blame_path
(
project
,
tree_join
(
'master'
,
path
),
anchor:
ending_fragment
)))
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment