summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-08 09:39:48 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-08 09:39:48 +0000
commit6c32abc5f7f090d4932054e5cc1ff0594edd5ff1 (patch)
treea0479bec69170a6052abf806eee3faeb64aeb861 /app/helpers
parent757084f715ffc06f563bdf971302995a3b181c06 (diff)
parentda8d6feb2c9a273a32b072fbed30f958435c2eeb (diff)
downloadgitlab-ce-6c32abc5f7f090d4932054e5cc1ff0594edd5ff1.tar.gz
Merge branch 'rs-task_list' into 'master'
Use task_list gem for task lists Task Lists can now be used in comments, and they'll render in previews. :clap: Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271 See merge request !599
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/notes_helper.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index ab44fa6ee43..271b53aa2b6 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -9,6 +9,10 @@ module NotesHelper
hidden_field_tag(:target_id, note.noteable.id)
end
+ def note_editable?(note)
+ note.editable? && can?(current_user, :admin_note, note)
+ end
+
def link_to_commit_diff_line_note(note)
if note.for_commit_diff_line?
link_to(