Commit ad1ce123 authored by Stan Hu's avatar Stan Hu

Merge branch 'noteable-touch-return-object' into 'master'

Return the noteable in Note#touch_noteable

See merge request gitlab-org/gitlab-ce!15891
parents 2df1f4a5 d79e82c9
...@@ -401,6 +401,9 @@ class Note < ActiveRecord::Base ...@@ -401,6 +401,9 @@ class Note < ActiveRecord::Base
end end
noteable_object&.touch noteable_object&.touch
# We return the noteable object so we can re-use it in EE for ElasticSearch.
noteable_object
end end
def banzai_render_context(field) def banzai_render_context(field)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment