Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 2 deletions

diff --git a/app/assets/javascripts/content_editor/extensions/blockquote.js b/app/assets/javascripts/content_editor/extensions/blockquote.js
index 5632bc28592..9b424ac8367 100644
--- a/app/assets/javascripts/content_editor/extensions/blockquote.js
+++ b/app/assets/javascripts/content_editor/extensions/blockquote.js
@@ -26,7 +26,7 @@ export default Blockquote.extend({
     const multilineInputRegex = /^\s*>>>\s$/gm;
 
     return [
-      ...this.parent?.(),
+      ...this.parent(),
       wrappingInputRule({
         find: multilineInputRegex,
         type: this.type,
diff --git a/app/assets/javascripts/content_editor/services/markdown_sourcemap.js b/app/assets/javascripts/content_editor/services/markdown_sourcemap.js
index 4285e04bbab..fe1b32c5b0a 100644
--- a/app/assets/javascripts/content_editor/services/markdown_sourcemap.js
+++ b/app/assets/javascripts/content_editor/services/markdown_sourcemap.js
@@ -30,7 +30,7 @@ export const getMarkdownSource = (element) => {
 
   for (let i = range.start.row; i <= range.end.row; i += 1) {
     if (i === range.start.row) {
-      elSource += source[i]?.substring(range.start.col);
+      elSource += source[i].substring(range.start.col);
     } else if (i === range.end.row) {
       elSource += `\n${source[i]?.substring(0, range.start.col)}`;
     } else {