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
c6d71b7b
Commit
c6d71b7b
authored
Sep 14, 2012
by
Riyad Preukschas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename 'notes/per_line_show' partial to 'notes/per_line_note'
parent
dd1b3177
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/views/commits/_text_file.html.haml
app/views/commits/_text_file.html.haml
+1
-1
app/views/notes/_create_per_line_note.js.haml
app/views/notes/_create_per_line_note.js.haml
+2
-2
app/views/notes/_per_line_note.html.haml
app/views/notes/_per_line_note.html.haml
+0
-0
No files found.
app/views/commits/_text_file.html.haml
View file @
c6d71b7b
...
@@ -21,6 +21,6 @@
...
@@ -21,6 +21,6 @@
-
comments
=
@line_notes
.
select
{
|
n
|
n
.
line_code
==
line_code
}.
sort_by
(
&
:created_at
)
-
comments
=
@line_notes
.
select
{
|
n
|
n
.
line_code
==
line_code
}.
sort_by
(
&
:created_at
)
-
unless
comments
.
empty?
-
unless
comments
.
empty?
-
comments
.
each_with_index
do
|
note
,
i
|
-
comments
.
each_with_index
do
|
note
,
i
|
=
render
"notes/per_line_
show
"
,
note:
note
=
render
"notes/per_line_
note
"
,
note:
note
-
@line_notes
.
reject!
{
|
n
|
n
==
note
}
-
@line_notes
.
reject!
{
|
n
|
n
==
note
}
=
render
"notes/per_line_reply_button"
,
line_code:
line_code
=
render
"notes/per_line_reply_button"
,
line_code:
line_code
app/views/notes/_create_per_line_note.js.haml
View file @
c6d71b7b
...
@@ -12,8 +12,8 @@
...
@@ -12,8 +12,8 @@
var trEl = $(".
#{
note
.
line_code
}
").parent();
var trEl = $(".
#{
note
.
line_code
}
").parent();
// ... and insert the note and the reply button after it
// ... and insert the note and the reply button after it
trEl.after("
#{
escape_javascript
(
render
"notes/per_line_reply_button"
,
line_code:
note
.
line_code
)
}
");
trEl.after("
#{
escape_javascript
(
render
"notes/per_line_reply_button"
,
line_code:
note
.
line_code
)
}
");
trEl.after("
#{
escape_javascript
(
render
"notes/per_line_
show
"
,
note:
note
)
}
");
trEl.after("
#{
escape_javascript
(
render
"notes/per_line_
note
"
,
note:
note
)
}
");
} else {
} else {
// instert new note before reply button
// instert new note before reply button
trRpl.before("
#{
escape_javascript
(
render
"notes/per_line_
show
"
,
note:
note
)
}
");
trRpl.before("
#{
escape_javascript
(
render
"notes/per_line_
note
"
,
note:
note
)
}
");
}
}
app/views/notes/_per_line_
show
.html.haml
→
app/views/notes/_per_line_
note
.html.haml
View file @
c6d71b7b
File moved
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