Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 5 deletions

diff --git a/spec/frontend/repository/components/table/parent_row_spec.js b/spec/frontend/repository/components/table/parent_row_spec.js
index 7020055271f..63f84b2597b 100644
--- a/spec/frontend/repository/components/table/parent_row_spec.js
+++ b/spec/frontend/repository/components/table/parent_row_spec.js
@@ -30,8 +30,8 @@ describe('Repository parent row component', () => {
 
   it.each`
     path            | to
-    ${'app'}        | ${'/tree/master/'}
-    ${'app/assets'} | ${'/tree/master/app'}
+    ${'app'}        | ${'/-/tree/master/'}
+    ${'app/assets'} | ${'/-/tree/master/app'}
   `('renders link in $path to $to', ({ path, to }) => {
     factory(path);
 
@@ -46,7 +46,7 @@ describe('Repository parent row component', () => {
     vm.find('td').trigger('click');
 
     expect($router.push).toHaveBeenCalledWith({
-      path: '/tree/master/app',
+      path: '/-/tree/master/app',
     });
   });
 
@@ -58,7 +58,7 @@ describe('Repository parent row component', () => {
     vm.find('a').trigger('click');
 
     expect($router.push).not.toHaveBeenCalledWith({
-      path: '/tree/master/app',
+      path: '/-/tree/master/app',
     });
   });
 });
diff --git a/spec/frontend/repository/components/table/row_spec.js b/spec/frontend/repository/components/table/row_spec.js
index 94fa8b1e363..3114b6a2eaa 100644
--- a/spec/frontend/repository/components/table/row_spec.js
+++ b/spec/frontend/repository/components/table/row_spec.js
@@ -83,7 +83,7 @@ describe('Repository table row component', () => {
     vm.trigger('click');
 
     if (pushes) {
-      expect($router.push).toHaveBeenCalledWith({ path: '/tree/master/test' });
+      expect($router.push).toHaveBeenCalledWith({ path: '/-/tree/master/test' });
     } else {
       expect($router.push).not.toHaveBeenCalled();
     }