Add latest changes from gitlab-org/gitlab@master

1 files changed, 20 insertions, 9 deletions

diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index 18451bc5273..8c75a4a13e8 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -279,19 +279,30 @@ module IssuablesHelper
       initialDescriptionText: issuable.description,
       initialTaskStatus: issuable.task_status
     }
+    data.merge!(issue_only_initial_data(issuable))
+    data.merge!(path_data(parent))
+    data.merge!(updated_at_by(issuable))
 
-    data[:hasClosingMergeRequest] = issuable.merge_requests_count(current_user) != 0 if issuable.is_a?(Issue)
-    data[:zoomMeetingUrl] = ZoomMeeting.canonical_meeting_url(issuable) if issuable.is_a?(Issue)
+    data
+  end
 
-    if parent.is_a?(Group)
-      data[:groupPath] = parent.path
-    else
-      data.merge!(projectPath: ref_project.path, projectNamespace: ref_project.namespace.full_path)
-    end
+  def issue_only_initial_data(issuable)
+    return {} unless issuable.is_a?(Issue)
 
-    data.merge!(updated_at_by(issuable))
+    {
+      hasClosingMergeRequest: issuable.merge_requests_count(current_user) != 0,
+      zoomMeetingUrl: ZoomMeeting.canonical_meeting_url(issuable),
+      sentryIssueIdentifier: SentryIssue.find_by(issue: issuable)&.sentry_issue_identifier # rubocop:disable CodeReuse/ActiveRecord
+    }
+  end
 
-    data
+  def path_data(parent)
+    return { groupPath: parent.path } if parent.is_a?(Group)
+
+    {
+        projectPath: ref_project.path,
+        projectNamespace: ref_project.namespace.full_path
+    }
   end
 
   def updated_at_by(issuable)