Add latest changes from gitlab-org/gitlab@master

spec/frontend/repository/components/table/parent_row_spec.js

@@ -31,9 +31,10 @@ describe('Repository parent row component', () => {
   });
   it.each`
-    path            | to
-    ${'app'}        | ${'/-/tree/master/'}
-    ${'app/assets'} | ${'/-/tree/master/app'}
+    path                  | to
+    ${'app'}              | ${'/-/tree/master/'}
+    ${'app/assets'}       | ${'/-/tree/master/app'}
+    ${'app/assets#/test'} | ${'/-/tree/master/app/assets%23'}
   `('renders link in $path to $to', ({ path, to }) => {
     factory(path);

spec/frontend/repository/components/table/row_spec.js

@@ -95,6 +95,22 @@ describe('Repository table row component', () => {
     });
   });
+  it('pushes new route for directory with hash', () => {
+    factory({
+      id: '1',
+      sha: '123',
+      path: 'test#',
+      type: 'tree',
+      currentPath: '/',
+    });
+
+    return vm.vm.$nextTick().then(() => {
+      vm.trigger('click');
+
+      expect($router.push).toHaveBeenCalledWith({ path: '/-/tree/master/test%23' });
+    });
+  });
+
   it.each`
     type        | pushes
     ${'tree'}   | ${true}

spec/javascripts/ide/stores/actions_spec.js

@@ -591,11 +591,7 @@ describe('Multi-file store actions', () => {
         'path',
         store.state,
         [{ type: types.DELETE_ENTRY, payload: 'path' }],
-        [
-          { type: 'burstUnusedSeal' },
-          { type: 'stageChange', payload: 'path' },
-          { type: 'triggerFilesChange' },
-        ],
+        [{ type: 'stageChange', payload: 'path' }, { type: 'triggerFilesChange' }],
         done,
       );
     });
@@ -623,7 +619,6 @@ describe('Multi-file store actions', () => {
         store.state,
         [{ type: types.DELETE_ENTRY, payload: 'testFolder/entry-to-delete' }],
         [
-          { type: 'burstUnusedSeal' },
           { type: 'stageChange', payload: 'testFolder/entry-to-delete' },
           { type: 'triggerFilesChange' },
         ],
@@ -688,11 +683,7 @@ describe('Multi-file store actions', () => {
             testEntry.path,
             store.state,
             [{ type: types.DELETE_ENTRY, payload: testEntry.path }],
-            [
-              { type: 'burstUnusedSeal' },
-              { type: 'stageChange', payload: testEntry.path },
-              { type: 'triggerFilesChange' },
-            ],
+            [{ type: 'stageChange', payload: testEntry.path }, { type: 'triggerFilesChange' }],
             done,
           );
         });

spec/models/project_spec.rb

@@ -3691,7 +3691,7 @@ describe Project do
     end
   end
-  describe '.wrap_authorized_projects_with_cte' do
+  describe '.wrap_with_cte' do
     let!(:user) { create(:user) }
     let!(:private_project) do
@@ -3702,10 +3702,10 @@ describe Project do
     let(:projects) { described_class.all.public_or_visible_to_user(user) }
-    subject { described_class.wrap_authorized_projects_with_cte(projects) }
+    subject { described_class.wrap_with_cte(projects) }
     it 'wrapped query matches original' do
-      expect(subject.to_sql).to match(/^WITH "authorized_projects" AS/)
+      expect(subject.to_sql).to match(/^WITH "projects_cte" AS/)
       expect(subject).to match_array(projects)
     end
   end

yarn.lock

@@ -735,15 +735,15 @@
   dependencies:
     vue-eslint-parser "^6.0.4"
-"@gitlab/svgs@^1.94.0":
-  version "1.94.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.94.0.tgz#d6a39f982811f82d942692a91bf2678961752eba"
-  integrity sha512-lB7HTVsNPBLUEgNUXLLC4V/XJsWg7aSO7RBp6cuuL3n6fUS9VGfELH9aBnuPJglTHddktcnElkZ3S54XI8kYHw==
-"@gitlab/ui@^9.3.0":
-  version "9.3.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-9.3.0.tgz#851b4246c2e661a5a343184f74e0448c597ce28c"
-  integrity sha512-DB9Q8XDLfn3Ui6EfYTVnmHVYPwbukocYTWL+uD6zN3leiamYQqaoYGmtcrXk9oSiAyuJYwaJlCzlblG1GPwnfw==
+"@gitlab/svgs@^1.95.0":
+  version "1.95.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.95.0.tgz#105311b8eae530dbe586232925690ca3e947a89b"
+  integrity sha512-sGvtkf5XgDhMA9vPJu2YLHiEk4tbF6W9AAxAl3lMfwaFdF4mwfOwVtAWLJaM+9ubL91t+jVsOtHGsAzATufnlg==
+"@gitlab/ui@^9.4.0":
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-9.4.0.tgz#ffe3ca7845801cdefd42a9a7cc423a320d7ffdc2"
+  integrity sha512-dsr+IZPjfe+UHVLlhVHF4kXd2daRUGzplC9WA5Odf1q9kHugGn1yK7glT5VCRQa2vtiTVvqGwXB7ENfHoz23Kg==
   dependencies:
     "@babel/standalone" "^7.0.0"
     "@gitlab/vue-toasted" "^1.3.0"
@@ -989,10 +989,10 @@
     "@sentry/types" "5.10.0"
     tslib "^1.9.3"
-"@sourcegraph/code-host-integration@0.0.21":
-  version "0.0.21"
-  resolved "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.21.tgz#d536ccb3d9fda6d0c9d611ed6b80813265d8cb2f"
-  integrity sha512-HRBb6FO5+kc0JM6mAzhBGrDCuMdkGBjgdnKGnkW8B/FFKEtZEB6HI4ghGfY0eH01tFRis7snkZ4b3NSLjAbHew==
+"@sourcegraph/code-host-integration@0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.29.tgz#71b4392ad9bd4527f5baddc32bb90fda5c00a9c7"
+  integrity sha512-YtCZSuiBTUzlk2ku9xIHPbEIBYfwNtdZQCVaEL1AvMG0Ds0tEDBiiRdW/ZpdYjskOGwslv2wkKC2sGE/zUUrIQ==
 "@types/anymatch@*":
   version "1.3.0"