Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 1 deletions

diff --git a/app/assets/javascripts/repository/index.js b/app/assets/javascripts/repository/index.js
index 9753173ac30..74ef678c558 100644
--- a/app/assets/javascripts/repository/index.js
+++ b/app/assets/javascripts/repository/index.js
@@ -122,7 +122,7 @@ export default function setupVueRepositoryList() {
         return h(LastCommit, {
           props: {
             currentPath: this.$route.params.path,
-            refType: this.$route.query.ref_type,
+            refType: this.$route.meta.refType || this.$route.query.ref_type,
           },
         });
       },
diff --git a/app/assets/javascripts/repository/router.js b/app/assets/javascripts/repository/router.js
index 5f73912ed2b..31bafab742d 100644
--- a/app/assets/javascripts/repository/router.js
+++ b/app/assets/javascripts/repository/router.js
@@ -63,6 +63,9 @@ export default function createRouter(base, baseRef) {
         props: {
           refType: 'HEADS',
         },
+        meta: {
+          refType: 'HEADS',
+        },
       },
     ],
   });