diff options
| author | 🙈 jacopo beschi 🙉 <intrip@gmail.com> | 2018-06-01 15:09:08 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-01 15:09:08 +0000 |
| commit | 4c8783636cdc279aea802760146d58e6259bed57 (patch) | |
| tree | 0dac9783096bc26435d0fba5366a6fa6a0d9925b /app | |
| parent | d637fbe9af3f1efb9ce0a35c018a83c8b96d1f34 (diff) | |
| download | gitlab-ce-4c8783636cdc279aea802760146d58e6259bed57.tar.gz | |
Resolve "Update `updated_at` on an issue/mr on every issue/mr changes"
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/concerns/time_trackable.rb | 6 | ||||
| -rw-r--r-- | app/models/timelog.rb | 4 | ||||
| -rw-r--r-- | app/services/issuable_base_service.rb | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/app/models/concerns/time_trackable.rb b/app/models/concerns/time_trackable.rb index 1caf47072bc..0fc321c52bc 100644 --- a/app/models/concerns/time_trackable.rb +++ b/app/models/concerns/time_trackable.rb @@ -30,8 +30,6 @@ module TimeTrackable return if @time_spent == 0 - touch if touchable? - if @time_spent == :reset reset_spent_time else @@ -59,10 +57,6 @@ module TimeTrackable private - def touchable? - valid? && persisted? - end - def reset_spent_time timelogs.new(time_spent: total_time_spent * -1, user: @time_spent_user) # rubocop:disable Gitlab/ModuleWithInstanceVariables end diff --git a/app/models/timelog.rb b/app/models/timelog.rb index e166cf69703..f4c5c581a11 100644 --- a/app/models/timelog.rb +++ b/app/models/timelog.rb @@ -2,8 +2,8 @@ class Timelog < ActiveRecord::Base validates :time_spent, :user, presence: true validate :issuable_id_is_present - belongs_to :issue - belongs_to :merge_request + belongs_to :issue, touch: true + belongs_to :merge_request, touch: true belongs_to :user def issuable diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb index 1f67e3ecf9d..683f64e82ad 100644 --- a/app/services/issuable_base_service.rb +++ b/app/services/issuable_base_service.rb @@ -183,7 +183,10 @@ class IssuableBaseService < BaseService old_associations = associations_before_update(issuable) label_ids = process_label_ids(params, existing_label_ids: issuable.label_ids) - params[:label_ids] = label_ids if labels_changing?(issuable.label_ids, label_ids) + if labels_changing?(issuable.label_ids, label_ids) + params[:label_ids] = label_ids + issuable.touch + end if issuable.changed? || params.present? issuable.assign_attributes(params.merge(updated_by: current_user)) |