Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 4 deletions

diff --git a/app/assets/javascripts/diffs/utils/merge_request.js b/app/assets/javascripts/diffs/utils/merge_request.js
index 10e2a4b2cf2..edb4304f558 100644
--- a/app/assets/javascripts/diffs/utils/merge_request.js
+++ b/app/assets/javascripts/diffs/utils/merge_request.js
@@ -1,10 +1,20 @@
+const endpointRE = /^(\/?(.+?)\/(.+?)\/-\/merge_requests\/(\d+)).*$/i;
+
 export function getDerivedMergeRequestInformation({ endpoint } = {}) {
-  const mrPath = endpoint
-    ?.split('/')
-    .slice(0, -1)
-    .join('/');
+  let mrPath;
+  let userOrGroup;
+  let project;
+  let id;
+  const matches = endpointRE.exec(endpoint);
+
+  if (matches) {
+    [, mrPath, userOrGroup, project, id] = matches;
+  }
 
   return {
     mrPath,
+    userOrGroup,
+    project,
+    id,
   };
 }