diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-13 08:44:03 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-13 08:44:03 +0000 |
| commit | 4127b93dc3115b0da5b5fe7d56cc972ee9ade1de (patch) | |
| tree | f4ab64424ae7fe4b1f181fcb7e6e1f3fd9cdbbec | |
| parent | 5d8c617ee24f6095705e6eef702afd4b06d755b4 (diff) | |
| parent | be16f54d9d167c6338367c8175aaf135c44dab94 (diff) | |
| download | gitlab-ce-4127b93dc3115b0da5b5fe7d56cc972ee9ade1de.tar.gz | |
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
| -rw-r--r-- | app/models/timelog.rb | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/rails5-fix-47366.yml | 5 |
2 files changed, 10 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 diff --git a/changelogs/unreleased/rails5-fix-47366.yml b/changelogs/unreleased/rails5-fix-47366.yml new file mode 100644 index 00000000000..7ea03d2b95e --- /dev/null +++ b/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 |