diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-20 00:34:38 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-20 00:34:38 +0300 |
| commit | 68d4ab2381ebfe4ad53910a6f1ce6de311c28f8f (patch) | |
| tree | 88f1993c2b64556c20d01e7a9a423e3a6693ab4b /app/finders | |
| parent | ef1ed8f7026d442680f661bfcf64fa7b668556c6 (diff) | |
| parent | 22bbb379ae976d94d7ddd7addb7384e0b79ddfd9 (diff) | |
Merge branch 'emoji_votes' into 'master'
Award Emoji
This it first iteration of award emoji feature.
We have plan to extend emoji picker by the next release.
For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like ":+1:" and any other. You can post not only emoji that listed in the emoji picker.
See merge request !1825
Diffstat (limited to 'app/finders')
| -rw-r--r-- | app/finders/notes_finder.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/finders/notes_finder.rb b/app/finders/notes_finder.rb index ab252821b52..fa4c635f55c 100644 --- a/app/finders/notes_finder.rb +++ b/app/finders/notes_finder.rb @@ -12,9 +12,9 @@ class NotesFinder when "commit" project.notes.for_commit_id(target_id).not_inline when "issue" - project.issues.find(target_id).notes.inc_author + project.issues.find(target_id).notes.nonawards.inc_author when "merge_request" - project.merge_requests.find(target_id).mr_and_commit_notes.inc_author + project.merge_requests.find(target_id).mr_and_commit_notes.nonawards.inc_author when "snippet", "project_snippet" project.snippets.find(target_id).notes else |