diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-12-12 22:31:46 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-12-12 22:31:46 +0000 |
| commit | ad1ce1238e8adfb1d10529a99ffd2b298bde3fb5 (patch) | |
| tree | 8115f498b2f1279418dfc82a2409a8d1abcf6c5c | |
| parent | 2df1f4a515ab5cbfdd3116566ab9c8d786539041 (diff) | |
| parent | d79e82c9dde90e120bd6cf1584c3f20079c0c756 (diff) | |
| download | gitlab-ce-ad1ce1238e8adfb1d10529a99ffd2b298bde3fb5.tar.gz | |
Merge branch 'noteable-touch-return-object' into 'master'
Return the noteable in Note#touch_noteable
See merge request gitlab-org/gitlab-ce!15891
| -rw-r--r-- | app/models/note.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index c4c2ab8e67d..02f9fd61e49 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -401,6 +401,9 @@ class Note < ActiveRecord::Base end noteable_object&.touch + + # We return the noteable object so we can re-use it in EE for ElasticSearch. + noteable_object end def banzai_render_context(field) |