diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 17:34:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 17:34:42 +0300 |
| commit | 9f46488805e86b1bc341ea1620b866016c2ce5ed (patch) | |
| tree | f9748c7e287041e37d6da49e0a29c9511dc34768 /lib/static_model.rb | |
| parent | dfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff) | |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'lib/static_model.rb')
| -rw-r--r-- | lib/static_model.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/static_model.rb b/lib/static_model.rb index 86bf8d62f9a..27805817f4d 100644 --- a/lib/static_model.rb +++ b/lib/static_model.rb @@ -40,10 +40,6 @@ module StaticModel end def ==(other) - if other.is_a? ::StaticModel - id == other.id - else - super - end + other.present? && other.is_a?(self.class) && id == other.id end end |