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

Return the noteable in Note#touch_noteable See merge request gitlab-org/gitlab-ce!15891

Merge branch 'noteable-touch-return-object' into 'master'
ad1ce123 · Stan Hu · 2df1f4a5 · d79e82c9 · ad1ce123
Commit ad1ce123 authored Dec 12, 2017 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

note.rb app/models/note.rb +3 -0

No files found.
--- 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)