summaryrefslogtreecommitdiff
path: root/app/models/timelog.rb
diff options
context:
space:
mode:
authorJasper Maes <jaspermaes.jm@gmail.com>2018-06-13 07:48:05 +0200
committerJasper Maes <jaspermaes.jm@gmail.com>2018-06-13 07:52:35 +0200
commitbe16f54d9d167c6338367c8175aaf135c44dab94 (patch)
treef37de508a845b4859f46e569afb5d1a55fbcdb58 /app/models/timelog.rb
parentfba123a329f44ed80bbf71feb639dab9afc13d6f (diff)
downloadgitlab-ce-be16f54d9d167c6338367c8175aaf135c44dab94.tar.gz
Rails5 fix expected `issuable.reload.updated_at` to have changed
Diffstat (limited to 'app/models/timelog.rb')
-rw-r--r--app/models/timelog.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/timelog.rb b/app/models/timelog.rb
index f4c5c581a11..659146f43e4 100644
--- a/app/models/timelog.rb
+++ b/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