summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-09-14 05:21:58 +0200
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-09-14 21:41:57 +0200
commitc6d71b7b8e5e8dc22da9b8aab392196d1987fd68 (patch)
tree11b7cb955c2cabbbb4ee872d92dc9ad92263c8e4 /app
parentdd1b3177c999560818e8bbfb549630234f6ec9f0 (diff)
downloadgitlab-ce-c6d71b7b8e5e8dc22da9b8aab392196d1987fd68.tar.gz
Rename 'notes/per_line_show' partial to 'notes/per_line_note'
Diffstat (limited to 'app')
-rw-r--r--app/views/commits/_text_file.html.haml2
-rw-r--r--app/views/notes/_create_per_line_note.js.haml4
-rw-r--r--app/views/notes/_per_line_note.html.haml (renamed from app/views/notes/_per_line_show.html.haml)0
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/commits/_text_file.html.haml b/app/views/commits/_text_file.html.haml
index f7dae3016cd..7626a015bfc 100644
--- a/app/views/commits/_text_file.html.haml
+++ b/app/views/commits/_text_file.html.haml
@@ -21,6 +21,6 @@
- comments = @line_notes.select { |n| n.line_code == line_code }.sort_by(&:created_at)
- unless comments.empty?
- 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 }
= render "notes/per_line_reply_button", line_code: line_code
diff --git a/app/views/notes/_create_per_line_note.js.haml b/app/views/notes/_create_per_line_note.js.haml
index d7f0a0dc975..180960e38e4 100644
--- a/app/views/notes/_create_per_line_note.js.haml
+++ b/app/views/notes/_create_per_line_note.js.haml
@@ -12,8 +12,8 @@
var trEl = $(".#{note.line_code}").parent();
// ... 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_show", note: note)}");
+ trEl.after("#{escape_javascript(render "notes/per_line_note", note: note)}");
} else {
// 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)}");
}
diff --git a/app/views/notes/_per_line_show.html.haml b/app/views/notes/_per_line_note.html.haml
index 28bcd6e0c94..28bcd6e0c94 100644
--- a/app/views/notes/_per_line_show.html.haml
+++ b/app/views/notes/_per_line_note.html.haml