Merge branch 'rails5-fix-47366' into 'master'

Rails5 fix expected `issuable.reload.updated_at` to have changed

Closes #47366

See merge request gitlab-org/gitlab-ce!19733

app/models/timelog.rb

@@ -19,4 +19,9 @@ class Timelog < ActiveRecord::Base
       errors.add(:base, 'Issue or Merge Request ID is required')
     end
   end
+
+  # Rails5 defaults to :touch_later, overwrite for normal touch
+  def belongs_to_touch_method
+    :touch
+  end
 end

changelogs/unreleased/rails5-fix-47366.yml

@@ -0,0 +1,5 @@
+---
+title: Rails5 fix expected `issuable.reload.updated_at` to have changed
+merge_request: 19733
+author: Jasper Maes
+type: fixed