diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-11 12:09:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-11 12:09:58 +0300 |
| commit | a350f877c4246fee981690388239d1e19e17202a (patch) | |
| tree | fc75efe26a34c732ab85b1dc6cf09fcab558e3f8 /app/models/concerns/issuable.rb | |
| parent | 7adadf7e5b83c46f7e83051146624719e9b6bf0d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/issuable.rb')
| -rw-r--r-- | app/models/concerns/issuable.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb index b4289a0d131..2d06247a486 100644 --- a/app/models/concerns/issuable.rb +++ b/app/models/concerns/issuable.rb @@ -468,9 +468,11 @@ module Issuable if self.respond_to?(:total_time_spent) old_total_time_spent = old_associations.fetch(:total_time_spent, total_time_spent) + old_time_change = old_associations.fetch(:time_change, time_change) if old_total_time_spent != total_time_spent changes[:total_time_spent] = [old_total_time_spent, total_time_spent] + changes[:time_change] = [old_time_change, time_change] end end end |