summaryrefslogtreecommitdiff
path: root/app/views/commits
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-10-29 15:55:37 +0100
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-12-03 22:51:55 +0100
commit9b919939a35f9e5606f86a09eafa2a392d40d1a7 (patch)
tree36e33d493cd60e236fb3673927e26a0091d98b8a /app/views/commits
parentb91d6802572eeb152bd86dd68c54ef4151180848 (diff)
downloadgitlab-ce-9b919939a35f9e5606f86a09eafa2a392d40d1a7.tar.gz
Fix parameter passing and wording for per line notes
Diffstat (limited to 'app/views/commits')
-rw-r--r--app/views/commits/_text_file.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/commits/_text_file.html.haml b/app/views/commits/_text_file.html.haml
index 02117386d71..5e7886922b4 100644
--- a/app/views/commits/_text_file.html.haml
+++ b/app/views/commits/_text_file.html.haml
@@ -17,7 +17,7 @@
%td.new_line= link_to raw(type == "old" ? "&nbsp;" : line_new) , "##{line_code}", id: line_code
%td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line} &nbsp;"
- - if @comments_allowed
+ - if @reply_allowed
- comments = @line_notes.select { |n| n.line_code == line_code }.sort_by(&:created_at)
- unless comments.empty?
= render "notes/per_line_notes_with_reply", notes: comments