diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 09:08:20 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 09:08:20 +0000 |
commit | d80f3cd75e700b6e62910865bfd36734644ffa89 (patch) | |
tree | aa2fa2f2b4385854c13591bef8e74924ef661657 /app/models/resource_event.rb | |
parent | be81c1578d65f25edfde8aa550f190b8d3e6d976 (diff) | |
download | gitlab-ce-d80f3cd75e700b6e62910865bfd36734644ffa89.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/resource_event.rb')
-rw-r--r-- | app/models/resource_event.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/resource_event.rb b/app/models/resource_event.rb index 2c0052b0be3..86e11c2d568 100644 --- a/app/models/resource_event.rb +++ b/app/models/resource_event.rb @@ -21,7 +21,7 @@ class ResourceEvent < ApplicationRecord private def discussion_id_key - [self.class.name, created_at, user_id] + [self.class.name, id, user_id] end def exactly_one_issuable |