Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 3 deletions

diff --git a/app/assets/javascripts/notes/stores/getters.js b/app/assets/javascripts/notes/stores/getters.js
index 6876220f75c..5ad7a811726 100644
--- a/app/assets/javascripts/notes/stores/getters.js
+++ b/app/assets/javascripts/notes/stores/getters.js
@@ -94,9 +94,9 @@ export const getUserDataByProp = (state) => (prop) => state.userData && state.us
 export const descriptionVersions = (state) => state.descriptionVersions;
 
 export const canUserAddIncidentTimelineEvents = (state) => {
-  return (
-    state.userData.can_add_timeline_events &&
-    state.noteableData.type === constants.NOTEABLE_TYPE_MAPPING.Incident
+  return Boolean(
+    state.userData?.can_add_timeline_events &&
+      state.noteableData.type === constants.NOTEABLE_TYPE_MAPPING.Incident,
   );
 };