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
Kazuhiko Shiozaki
gitlab-ce
Commits
8290c9a6
Commit
8290c9a6
authored
Feb 24, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use proper classes for sdiff content
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
58634dfb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
33 deletions
+29
-33
app/views/projects/notes/_discussion.html.haml
app/views/projects/notes/_discussion.html.haml
+6
-11
app/views/projects/notes/_discussion_diff.html.haml
app/views/projects/notes/_discussion_diff.html.haml
+23
-22
No files found.
app/views/projects/notes/_discussion.html.haml
View file @
8290c9a6
...
@@ -36,21 +36,17 @@
...
@@ -36,21 +36,17 @@
.discussion-body
.discussion-body
-
if
note
.
for_diff_line?
-
if
note
.
for_diff_line?
-
if
note
.
active?
-
if
note
.
active?
.content
=
render
"projects/notes/discussion_diff"
,
discussion_notes:
discussion_notes
,
note:
note
.file
=
render
"projects/notes/discussion_diff"
,
discussion_notes:
discussion_notes
,
note:
note
-
else
-
else
=
link_to
'show outdated discussion'
,
'#'
,
class:
'js-show-outdated-discussion'
=
link_to
'show outdated discussion'
,
'#'
,
class:
'js-show-outdated-discussion'
%div
.hide.outdated-discussion
%div
.hide.outdated-discussion
.content
.notes
{
rel:
discussion_notes
.
first
.
discussion_id
}
.notes
{
rel:
discussion_notes
.
first
.
discussion_id
}
=
render
discussion_notes
=
render
discussion_notes
-
else
-
else
.content
.notes
{
rel:
discussion_notes
.
first
.
discussion_id
}
.notes
{
rel:
discussion_notes
.
first
.
discussion_id
}
=
render
discussion_notes
=
render
discussion_notes
=
render
"projects/notes/discussion_reply_button"
,
note:
discussion_notes
.
first
=
render
"projects/notes/discussion_reply_button"
,
note:
discussion_notes
.
first
-# will be shown when the other one is hidden
-# will be shown when the other one is hidden
.discussion-hidden.content.hide
.discussion-hidden.content.hide
...
@@ -59,4 +55,3 @@
...
@@ -59,4 +55,3 @@
=
link_to
"javascript:;"
,
class:
"js-details-target js-toggler-target"
do
=
link_to
"javascript:;"
,
class:
"js-details-target js-toggler-target"
do
%i
.icon-eye-open
%i
.icon-eye-open
Show
Show
app/views/projects/notes/_discussion_diff.html.haml
View file @
8290c9a6
-
diff
=
note
.
diff
-
diff
=
note
.
diff
.header
.diff-file
-
if
diff
.
deleted_file
.diff-header
%span
=
diff
.
old_path
-
if
diff
.
deleted_file
-
else
%span
=
diff
.
old_path
%span
=
diff
.
new_path
-
else
-
if
diff
.
a_mode
&&
diff
.
b_mode
&&
diff
.
a_mode
!=
diff
.
b_mode
%span
=
diff
.
new_path
%span
.file-mode
=
"
#{
diff
.
a_mode
}
→
#{
diff
.
b_mode
}
"
-
if
diff
.
a_mode
&&
diff
.
b_mode
&&
diff
.
a_mode
!=
diff
.
b_mode
%br
/
%span
.file-mode
=
"
#{
diff
.
a_mode
}
→
#{
diff
.
b_mode
}
"
.content
%br
/
%table
.diff-content
-
each_diff_line_near
(
diff
,
note
.
diff_file_index
,
note
.
line_code
)
do
|
line
,
type
,
line_code
,
line_new
,
line_old
|
%table
%tr
.line_holder
{
id:
line_code
}
-
each_diff_line_near
(
diff
,
note
.
diff_file_index
,
note
.
line_code
)
do
|
line
,
type
,
line_code
,
line_new
,
line_old
|
-
if
type
==
"match"
%tr
.line_holder
{
id:
line_code
}
%td
.old_line
=
"..."
-
if
type
==
"match"
%td
.new_line
=
"..."
%td
.old_line
=
"..."
%td
.line_content.matched
=
line
%td
.new_line
=
"..."
-
else
%td
.line_content.matched
=
line
%td
.old_line
=
raw
(
type
==
"new"
?
" "
:
line_old
)
-
else
%td
.new_line
=
raw
(
type
==
"old"
?
" "
:
line_new
)
%td
.old_line
=
raw
(
type
==
"new"
?
" "
:
line_old
)
%td
.line_content
{
class:
"noteable_line #{type} #{line_code}"
,
"line_code"
=>
line_code
}=
raw
"
#{
line
}
"
%td
.new_line
=
raw
(
type
==
"old"
?
" "
:
line_new
)
%td
.line_content
{
class:
"noteable_line #{type} #{line_code}"
,
"line_code"
=>
line_code
}=
raw
"
#{
line
}
"
-
if
line_code
==
note
.
line_code
-
if
line_code
==
note
.
line_code
=
render
"projects/notes/diff_notes_with_reply"
,
notes:
discussion_notes
=
render
"projects/notes/diff_notes_with_reply"
,
notes:
discussion_notes
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