diff options
-rw-r--r-- | app/services/issuable_base_service.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb index 889e4508758..e77799e548c 100644 --- a/app/services/issuable_base_service.rb +++ b/app/services/issuable_base_service.rb @@ -216,15 +216,12 @@ class IssuableBaseService < BaseService params[:label_ids] = label_ids if labels_changing?(issuable.label_ids, label_ids) if issuable.changed? || params.present? - issuable.assign_attributes(params.merge(updated_by: current_user)) - if has_title_or_description_changed?(issuable) - issuable.assign_attributes(params.merge( - last_edited_at: Time.now, - last_edited_by: current_user - )) + issuable.assign_attributes(last_edited_at: Time.now, last_edited_by: current_user) end + issuable.assign_attributes(params.merge(updated_by: current_user)) + before_update(issuable) if issuable.with_transaction_returning_status { issuable.save } |