diff options
author | Jarka Košanová <jarka@gitlab.com> | 2019-06-28 20:09:31 +0300 |
---|---|---|
committer | Jarka Košanová <jarka@gitlab.com> | 2019-07-02 14:27:03 +0300 |
commit | 4d02fb67ad942ccd910db80d57d015ec9a81a7d5 (patch) | |
tree | 98dcfe8e72db02752307be690a0ec1568a7d90b4 /app/models/resource_label_event.rb | |
parent | 3fd4c77ee4777464af74acd0c9dda319e1d29a44 (diff) |
Update label note to support scoped labels notes
- port of EE change
Diffstat (limited to 'app/models/resource_label_event.rb')
-rw-r--r-- | app/models/resource_label_event.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/models/resource_label_event.rb b/app/models/resource_label_event.rb index f2c7cb6a65d..ad08f4763ae 100644 --- a/app/models/resource_label_event.rb +++ b/app/models/resource_label_event.rb @@ -36,10 +36,9 @@ class ResourceLabelEvent < ApplicationRecord issue || merge_request end - # create same discussion id for all actions with the same user and time def discussion_id(resource = nil) strong_memoize(:discussion_id) do - Digest::SHA1.hexdigest([self.class.name, created_at, user_id].join("-")) + Digest::SHA1.hexdigest(discussion_id_key.join("-")) end end @@ -121,4 +120,8 @@ class ResourceLabelEvent < ApplicationRecord def resource_parent issuable.project || issuable.group end + + def discussion_id_key + [self.class.name, created_at, user_id] + end end |