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-08-04 11:52:17 +0300
committerPhil Hughes <me@iamphill.com>2016-08-04 11:52:17 +0300
commit433f1c42c3958381a6af539e9a9ab206c749d9f4 (patch)
treed7cbefc34a9f7feed30786a068b4eb242104a70a /app/helpers/notes_helper.rb
parent538e66d71c0f7125cc62ea51480668ba8b342544 (diff)
Comment & resolve button no longer looks for can-resolve attribute
Fixed some bugs when removing notes
Diffstat (limited to 'app/helpers/notes_helper.rb')
-rw-r--r--app/helpers/notes_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index 0bff88f1dd2..6b00ebc98e7 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -79,7 +79,7 @@ module NotesHelper
def link_to_reply_discussion(discussion, line_type = nil)
return unless current_user
- data = discussion.reply_attributes.merge(line_type: line_type, can_resolve: discussion.can_resolve?(current_user))
+ data = discussion.reply_attributes.merge(line_type: line_type)
button_tag 'Reply...', class: 'btn btn-text-field js-discussion-reply-button',
data: data, title: 'Add a reply'