summaryrefslogtreecommitdiff
path: root/app/services/issuable_base_service.rb
diff options
context:
space:
mode:
authorblackst0ne <blackst0ne.ru@gmail.com>2017-05-03 17:54:00 +1100
committerblackst0ne <blackst0ne.ru@gmail.com>2017-05-04 12:58:41 +1100
commit35160a97f2dc781209515af4cdce6ff33e039cc9 (patch)
tree2683f751ea31bb6d023e325b963162bdcd1ab168 /app/services/issuable_base_service.rb
parentd9f48e45a124530211e0a65d25f5d41db5842c62 (diff)
downloadgitlab-ce-35160a97f2dc781209515af4cdce6ff33e039cc9.tar.gz
Add specs for issue and note changes
Diffstat (limited to 'app/services/issuable_base_service.rb')
-rw-r--r--app/services/issuable_base_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb
index e77799e548c..d0805fd6eb4 100644
--- a/app/services/issuable_base_service.rb
+++ b/app/services/issuable_base_service.rb
@@ -216,12 +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(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 }