diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-24 08:25:38 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-24 08:25:38 +0000 |
| commit | 56d2d462271da802a0126fa588f7ae76ae18f09f (patch) | |
| tree | 87d488623a41ccc1bb81e859d8745ccd51be1ab7 /app | |
| parent | c52db71e36ee70c4c5be80b029cf4362f28e3667 (diff) | |
| parent | 0230ca839a2ec8debcbe4476c3deed8b422bf451 (diff) | |
| download | gitlab-ce-56d2d462271da802a0126fa588f7ae76ae18f09f.tar.gz | |
Merge branch 'jprovazn-fix-resolvable' into 'master'
Check if note's noteable is not nil when checking resolvability
Closes #46573
See merge request gitlab-org/gitlab-ce!19081
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/concerns/resolvable_note.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/resolvable_note.rb b/app/models/concerns/resolvable_note.rb index 668c5a079e3..4a0f8b92b3a 100644 --- a/app/models/concerns/resolvable_note.rb +++ b/app/models/concerns/resolvable_note.rb @@ -32,7 +32,7 @@ module ResolvableNote # Keep this method in sync with the `potentially_resolvable` scope def potentially_resolvable? - RESOLVABLE_TYPES.include?(self.class.name) && noteable.supports_resolvable_notes? + RESOLVABLE_TYPES.include?(self.class.name) && noteable&.supports_resolvable_notes? end # Keep this method in sync with the `resolvable` scope |