Merge branch 'rs-revert-ce4b77a3' into 'master'

Revert "Merge branch 'ph/fixSlashAndHashVueRouter' into 'master'"

See merge request gitlab-org/gitlab!29958

app/assets/javascripts/repository/router.js

@@ -12,7 +12,7 @@ export default function createRouter(base, baseRef) {
     base: joinPaths(gon.relative_url_root || '', base),
     routes: [
       {
-        path: `(/-)?/tree/(${encodeURIComponent(baseRef).replace(/%2F/g, '/')}|${baseRef})/:path*`,
+        path: `(/-)?/tree/(${encodeURIComponent(baseRef)}|${baseRef})/:path*`,
         name: 'treePath',
         component: TreePage,
         props: route => ({

spec/frontend/repository/router_spec.js

@@ -4,15 +4,14 @@ import createRouter from '~/repository/router';
 
 describe('Repository router spec', () => {
   it.each`
-    path                                     | branch              | component    | componentName
-    ${'/'}                                   | ${'master'}         | ${IndexPage} | ${'IndexPage'}
-    ${'/tree/master'}                        | ${'master'}         | ${TreePage}  | ${'TreePage'}
-    ${'/-/tree/master'}                      | ${'master'}         | ${TreePage}  | ${'TreePage'}
-    ${'/-/tree/master/app/assets'}           | ${'master'}         | ${TreePage}  | ${'TreePage'}
-    ${'/-/tree/feature/test-%23/app/assets'} | ${'feature/test-#'} | ${TreePage}  | ${'TreePage'}
-    ${'/-/tree/123/app/assets'}              | ${'master'}         | ${null}      | ${'null'}
-  `('sets component as $componentName for path "$path"', ({ path, component, branch }) => {
-    const router = createRouter('', branch);
+    path                           | component    | componentName
+    ${'/'}                         | ${IndexPage} | ${'IndexPage'}
+    ${'/tree/master'}              | ${TreePage}  | ${'TreePage'}
+    ${'/-/tree/master'}            | ${TreePage}  | ${'TreePage'}
+    ${'/-/tree/master/app/assets'} | ${TreePage}  | ${'TreePage'}
+    ${'/-/tree/123/app/assets'}    | ${null}      | ${'null'}
+  `('sets component as $componentName for path "$path"', ({ path, component }) => {
+    const router = createRouter('', 'master');
 
     const componentsForRoute = router.getMatchedComponents(path);