Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-07-15 17:32:56 +0300
committerDouwe Maan <douwe@selenight.nl>2016-07-24 22:12:59 +0300
commite7626eb0e5a37a6da7c937d3f76d3fcd6b72d92c (patch)
treeb38961df6011cf3756de524bb8767d55035d370a /app/views/projects/notes
parent44cb5803a15ebbe322ac494ff03cfd5cfea2e9dd (diff)
Added comment & resolve button to reply form
Diffstat (limited to 'app/views/projects/notes')
-rw-r--r--app/views/projects/notes/_note.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index 456d87c6103..8ae252a9f29 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -20,7 +20,7 @@
- access = note_max_access_for_user(note)
- if access and not note.system
%span.note-role.hidden-xs= access
- - if !note.system && note.discussion_id && current_user
+ - if !note.system && note.new_diff_note? && current_user
%resolve-btn{ ":namespace" => "'#{note.project.namespace.path}/#{note.project.path}'", ":discussion-id" => "'#{note.discussion_id}'", ":note-id" => note.id, ":resolved" => "false", "inline-template" => true, "v-ref:note_#{note.id}" => true }
.note-action-button
= icon("spin spinner", "v-show" => "loading")