diff options
author | blackst0ne <blackst0ne.ru@gmail.com> | 2017-05-03 16:47:14 +1100 |
---|---|---|
committer | blackst0ne <blackst0ne.ru@gmail.com> | 2017-05-04 12:58:41 +1100 |
commit | 571c832d31690ba549d936c6cd921309eadad519 (patch) | |
tree | 186fc940dfac16fc10bb41d41c0dc57e53c943e9 | |
parent | 7ad5a1b371f5d319369a6b9d6609c40dea6292c2 (diff) | |
download | gitlab-ce-571c832d31690ba549d936c6cd921309eadad519.tar.gz |
Simplified assign_attributes for issuable
-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 } |