Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 4 deletions

diff --git a/app/assets/javascripts/projects/commits/index.js b/app/assets/javascripts/projects/commits/index.js
index 53169f689c9..f56884f605f 100644
--- a/app/assets/javascripts/projects/commits/index.js
+++ b/app/assets/javascripts/projects/commits/index.js
@@ -33,20 +33,31 @@ export const initCommitsRefSwitcher = () => {
 
   if (!el) return false;
 
-  const { projectId, ref, commitsPath } = el.dataset;
+  const { projectId, ref, commitsPath, refType } = el.dataset;
   const commitsPathPrefix = commitsPath.match(COMMITS_PATH_REGEX)?.[0];
-
+  const useSymbolicRefNames = Boolean(refType);
   return new Vue({
     el,
     render(createElement) {
       return createElement(RefSelector, {
         props: {
           projectId,
-          value: ref,
+          value: useSymbolicRefNames ? `refs/${refType}/${ref}` : ref,
+          useSymbolicRefNames,
+          refType,
         },
         on: {
           input(selected) {
-            visitUrl(`${commitsPathPrefix}/${selected}`);
+            if (useSymbolicRefNames) {
+              const matches = selected.match(/refs\/(heads|tags)\/(.+)/);
+              if (matches) {
+                visitUrl(`${commitsPathPrefix}/${matches[2]}?ref_type=${matches[1]}`);
+              } else {
+                visitUrl(`${commitsPathPrefix}/${selected}`);
+              }
+            } else {
+              visitUrl(`${commitsPathPrefix}/${selected}`);
+            }
           },
         },
       });