BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
81ee6938
Commit
81ee6938
authored
Oct 10, 2012
by
Riyad Preukschas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add links to the note source if the note is mixed in
parent
fb0279f3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
1 deletion
+17
-1
notes_helper.rb
app/helpers/notes_helper.rb
+10
-0
_text_file.html.haml
app/views/commits/_text_file.html.haml
+1
-1
_note.html.haml
app/views/notes/_note.html.haml
+6
-0
No files found.
app/helpers/notes_helper.rb
View file @
81ee6938
...
...
@@ -12,5 +12,15 @@ module NotesHelper
!
@mixed_targets
||
@main_target_type
==
note
.
noteable_type
end
def
link_to_commit_diff_line_note
(
note
)
return
unless
note
.
line_note?
commit
=
note
.
target
diff_index
,
diff_old_line
,
diff_new_line
=
note
.
line_code
.
split
(
'_'
)
link_file
=
commit
.
diffs
[
diff_index
.
to_i
].
new_path
link_line
=
diff_new_line
link_to
"
#{
link_file
}
:L
#{
link_line
}
"
,
project_commit_path
(
@project
,
commit
,
anchor:
note
.
line_code
)
end
end
app/views/commits/_text_file.html.haml
View file @
81ee6938
...
...
@@ -4,7 +4,7 @@
%table
{
class:
"#{'hide' if too_big}"
}
-
each_diff_line
(
diff
.
diff
.
lines
.
to_a
,
index
)
do
|
line
,
type
,
line_code
,
line_new
,
line_old
|
%tr
.line_holder
%tr
.line_holder
{
id:
line_code
}
-
if
type
==
"match"
%td
.old_line
=
"..."
%td
.new_line
=
"..."
...
...
app/views/notes/_note.html.haml
View file @
81ee6938
...
...
@@ -7,6 +7,12 @@
=
time_ago_in_words
(
note
.
updated_at
)
ago
-
unless
note_for_main_target?
(
note
)
-
if
note
.
commit?
%span
.cgray
on
#{
link_to
note
.
target
.
short_id
,
project_commit_path
(
@project
,
note
.
target
)
}
=
link_to_commit_diff_line_note
(
note
)
if
note
.
line_note?
-# only show vote if it's a note for the main target
-
if
note_for_main_target?
(
note
)
-
if
note
.
upvote?
...
...
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