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
Boxiang Sun
gitlab-ce
Commits
4c1bf77c
Commit
4c1bf77c
authored
Jun 20, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unneeded div
parent
9fc0e11e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
8 deletions
+4
-8
app/views/projects/notes/_diff_notes_with_reply.html.haml
app/views/projects/notes/_diff_notes_with_reply.html.haml
+1
-2
app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml
.../projects/notes/_diff_notes_with_reply_parallel.html.haml
+2
-4
app/views/projects/notes/discussions/_notes.html.haml
app/views/projects/notes/discussions/_notes.html.haml
+1
-2
No files found.
app/views/projects/notes/_diff_notes_with_reply.html.haml
View file @
4c1bf77c
...
@@ -4,5 +4,4 @@
...
@@ -4,5 +4,4 @@
%td
.notes_content
%td
.notes_content
%ul
.notes
{
data:
{
discussion_id:
note
.
discussion_id
}
}
%ul
.notes
{
data:
{
discussion_id:
note
.
discussion_id
}
}
=
render
partial:
"projects/notes/note"
,
collection:
notes
,
as: :note
=
render
partial:
"projects/notes/note"
,
collection:
notes
,
as: :note
.discussion-reply-holder
=
link_to_reply_discussion
(
note
)
=
link_to_reply_discussion
(
note
)
app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml
View file @
4c1bf77c
...
@@ -8,7 +8,6 @@
...
@@ -8,7 +8,6 @@
%ul
.notes
{
data:
{
discussion_id:
note_left
.
discussion_id
}
}
%ul
.notes
{
data:
{
discussion_id:
note_left
.
discussion_id
}
}
=
render
partial:
"projects/notes/note"
,
collection:
notes_left
,
as: :note
=
render
partial:
"projects/notes/note"
,
collection:
notes_left
,
as: :note
.discussion-reply-holder
=
link_to_reply_discussion
(
note_left
,
'old'
)
=
link_to_reply_discussion
(
note_left
,
'old'
)
-
else
-
else
%td
.notes_line.old
=
""
%td
.notes_line.old
=
""
...
@@ -20,7 +19,6 @@
...
@@ -20,7 +19,6 @@
%ul
.notes
{
data:
{
discussion_id:
note_right
.
discussion_id
}
}
%ul
.notes
{
data:
{
discussion_id:
note_right
.
discussion_id
}
}
=
render
partial:
"projects/notes/note"
,
collection:
notes_right
,
as: :note
=
render
partial:
"projects/notes/note"
,
collection:
notes_right
,
as: :note
.discussion-reply-holder
=
link_to_reply_discussion
(
note_right
,
'new'
)
=
link_to_reply_discussion
(
note_right
,
'new'
)
-
else
-
else
%td
.notes_line.new
=
""
%td
.notes_line.new
=
""
...
...
app/views/projects/notes/discussions/_notes.html.haml
View file @
4c1bf77c
...
@@ -3,5 +3,4 @@
...
@@ -3,5 +3,4 @@
.notes
{
data:
{
discussion_id:
note
.
discussion_id
}
}
.notes
{
data:
{
discussion_id:
note
.
discussion_id
}
}
%ul
.notes.timeline
%ul
.notes.timeline
=
render
partial:
"projects/notes/note"
,
collection:
discussion_notes
,
as: :note
=
render
partial:
"projects/notes/note"
,
collection:
discussion_notes
,
as: :note
.discussion-reply-holder
=
link_to_reply_discussion
(
note
)
=
link_to_reply_discussion
(
note
)
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