Merge branch 'blame-line-link' into 'master'
Added line links to blame table Closes #4119 See merge request !2915
This commit is contained in:
commit
54a5b8831a
|
@ -91,7 +91,7 @@ class Dispatcher
|
|||
new TreeView()
|
||||
when 'projects:find_file:show'
|
||||
shortcut_handler = true
|
||||
when 'projects:blob:show'
|
||||
when 'projects:blob:show', 'projects:blame:show'
|
||||
new LineHighlighter()
|
||||
shortcut_handler = new ShortcutsNavigation()
|
||||
when 'projects:labels:new', 'projects:labels:edit'
|
||||
|
|
|
@ -44,8 +44,10 @@
|
|||
white-space: nowrap;
|
||||
|
||||
i {
|
||||
float: left;
|
||||
margin-top: 3px;
|
||||
margin-right: 5px;
|
||||
visibility: hidden;
|
||||
@extend .pull-left;
|
||||
}
|
||||
|
||||
&:hover i {
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
%h3.page-title Blame view
|
||||
|
||||
#tree-holder.tree-holder
|
||||
#blob-content-holder.tree-holder
|
||||
.file-holder
|
||||
.file-title
|
||||
= blob_icon @blob.mode, @blob.name
|
||||
|
@ -33,7 +33,9 @@
|
|||
%td.line-numbers
|
||||
- line_count = blame_group[:lines].count
|
||||
- (current_line...(current_line + line_count)).each do |i|
|
||||
%a.diff-line-num= i
|
||||
%a.diff-line-num{href: "#L#{i}", id: "L#{i}", 'data-line-number' => i}
|
||||
= icon("link")
|
||||
= i
|
||||
\
|
||||
- current_line += line_count
|
||||
%td.lines
|
||||
|
|
Loading…
Reference in New Issue