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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
54a5b883
Commit
54a5b883
authored
8 years ago
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'blame-line-link' into 'master'
Added line links to blame table Closes #4119 See merge request !2915
parents
d10b43da
fbc578a7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
app/assets/javascripts/dispatcher.js.coffee
app/assets/javascripts/dispatcher.js.coffee
+1
-1
app/assets/stylesheets/framework/highlight.scss
app/assets/stylesheets/framework/highlight.scss
+3
-1
app/views/projects/blame/show.html.haml
app/views/projects/blame/show.html.haml
+4
-2
No files found.
app/assets/javascripts/dispatcher.js.coffee
View file @
54a5b883
...
@@ -91,7 +91,7 @@ class Dispatcher
...
@@ -91,7 +91,7 @@ class Dispatcher
new
TreeView
()
new
TreeView
()
when
'projects:find_file:show'
when
'projects:find_file:show'
shortcut_handler
=
true
shortcut_handler
=
true
when
'projects:blob:show'
when
'projects:blob:show'
,
'projects:blame:show'
new
LineHighlighter
()
new
LineHighlighter
()
shortcut_handler
=
new
ShortcutsNavigation
()
shortcut_handler
=
new
ShortcutsNavigation
()
when
'projects:labels:new'
,
'projects:labels:edit'
when
'projects:labels:new'
,
'projects:labels:edit'
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/highlight.scss
View file @
54a5b883
...
@@ -44,8 +44,10 @@
...
@@ -44,8 +44,10 @@
white-space
:
nowrap
;
white-space
:
nowrap
;
i
{
i
{
float
:
left
;
margin-top
:
3px
;
margin-right
:
5px
;
visibility
:
hidden
;
visibility
:
hidden
;
@extend
.pull-left
;
}
}
&
:hover
i
{
&
:hover
i
{
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/blame/show.html.haml
View file @
54a5b883
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
%h3
.page-title
Blame view
%h3
.page-title
Blame view
#
tree
-holder
.tree-holder
#
blob-content
-holder
.tree-holder
.file-holder
.file-holder
.file-title
.file-title
=
blob_icon
@blob
.
mode
,
@blob
.
name
=
blob_icon
@blob
.
mode
,
@blob
.
name
...
@@ -33,7 +33,9 @@
...
@@ -33,7 +33,9 @@
%td
.line-numbers
%td
.line-numbers
-
line_count
=
blame_group
[
:lines
].
count
-
line_count
=
blame_group
[
:lines
].
count
-
(
current_line
...
(
current_line
+
line_count
)).
each
do
|
i
|
-
(
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
-
current_line
+=
line_count
%td
.lines
%td
.lines
...
...
This diff is collapsed.
Click to expand it.
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