kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

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

Closes #47366

See merge request gitlab-org/gitlab-ce!19733
This commit is contained in:
Rémy Coutable 2018-06-13 08:44:03 +00:00
commit 4127b93dc3
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/models/timelog.rb
View file

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

5
changelogs/unreleased/rails5-fix-47366.yml Normal file
View file

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