diff options
author | Phil Hughes <me@iamphill.com> | 2016-07-29 11:19:56 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-07-29 11:19:56 +0100 |
commit | efb74875cfe1a1e2b3696f0129b819fc8e204876 (patch) | |
tree | 53bc2e8a9e45f6c31dcc729bf4646532c1e6b41a /app/helpers/notes_helper.rb | |
parent | d9a949c17c29c8531b2b0a1c227ab0b3341f0ba3 (diff) | |
download | gitlab-ce-efb74875cfe1a1e2b3696f0129b819fc8e204876.tar.gz |
Moved most of the data handling into discussion & notes models
Reduced some duplicated code with compiling components
Fixed bug with resolve button tooltip not updating after resolving discussion
Diffstat (limited to 'app/helpers/notes_helper.rb')
-rw-r--r-- | app/helpers/notes_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index 9d9b0dba57f..3761855efc7 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, resolvable: discussion.can_resolve?(current_user)) + data = discussion.reply_attributes.merge(line_type: line_type, can_resolve: discussion.can_resolve?(current_user)) button_tag 'Reply...', class: 'btn btn-text-field js-discussion-reply-button', data: data, title: 'Add a reply' |