diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-19 03:07:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-19 03:07:58 +0300 |
| commit | 41456efd551f45f569a8c9e70734c88efbbbf0ec (patch) | |
| tree | 4ac9d0f1773a8786ba263e88e3d472afcff3d3c1 /lib/static_model.rb | |
| parent | fe289cff8b1b94020d22f7b3ff1c385a05086b9e (diff) | |
Add latest changes from gitlab-org/gitlab@master
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 |