Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 18 insertions, 0 deletions

diff --git a/app/assets/javascripts/diffs/utils/merge_request.js b/app/assets/javascripts/diffs/utils/merge_request.js
index edb4304f558..43e04a814c5 100644
--- a/app/assets/javascripts/diffs/utils/merge_request.js
+++ b/app/assets/javascripts/diffs/utils/merge_request.js
@@ -1,14 +1,30 @@
 const endpointRE = /^(\/?(.+?)\/(.+?)\/-\/merge_requests\/(\d+)).*$/i;
 
+function getVersionInfo({ endpoint } = {}) {
+  const dummyRoot = 'https://gitlab.com';
+  const endpointUrl = new URL(endpoint, dummyRoot);
+  const params = Object.fromEntries(endpointUrl.searchParams.entries());
+
+  const { start_sha: startSha, diff_id: diffId } = params;
+
+  return {
+    diffId,
+    startSha,
+  };
+}
+
 export function getDerivedMergeRequestInformation({ endpoint } = {}) {
   let mrPath;
   let userOrGroup;
   let project;
   let id;
+  let diffId;
+  let startSha;
   const matches = endpointRE.exec(endpoint);
 
   if (matches) {
     [, mrPath, userOrGroup, project, id] = matches;
+    ({ diffId, startSha } = getVersionInfo({ endpoint }));
   }
 
   return {
@@ -16,5 +32,7 @@ export function getDerivedMergeRequestInformation({ endpoint } = {}) {
     userOrGroup,
     project,
     id,
+    diffId,
+    startSha,
   };
 }