From 634f8e96c3fce1dc777d24be50e5a8a2b71b2c19 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Sun, 28 Apr 2019 07:48:56 -0700 Subject: [PATCH 1/3] Gracefully handle undefined data in getTreeEntries() --- app/assets/javascripts/diffs/workers/tree_worker.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/assets/javascripts/diffs/workers/tree_worker.js b/app/assets/javascripts/diffs/workers/tree_worker.js index 534d737c77e..415c463fd19 100644 --- a/app/assets/javascripts/diffs/workers/tree_worker.js +++ b/app/assets/javascripts/diffs/workers/tree_worker.js @@ -4,6 +4,11 @@ import { generateTreeList } from '../store/utils'; // eslint-disable-next-line no-restricted-globals self.addEventListener('message', e => { const { data } = e; + + if (data === undefined) { + return; + } + const { treeEntries, tree } = generateTreeList(data); // eslint-disable-next-line no-restricted-globals -- GitLab From 010f0d64b767fa599edfc6f3010dd2bdf500c746 Mon Sep 17 00:00:00 2001 From: Heinrich Lee Yu Date: Mon, 29 Apr 2019 11:04:54 +0800 Subject: [PATCH 2/3] Fix search dropdown being hidden immediately --- app/assets/stylesheets/pages/search.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss index 0c99ff5341c..37071a57bb3 100644 --- a/app/assets/stylesheets/pages/search.scss +++ b/app/assets/stylesheets/pages/search.scss @@ -75,6 +75,8 @@ input[type='checkbox']:hover { } .search-input-wrap { + width: 100%; + .search-icon, .clear-icon { position: absolute; -- GitLab From a7fa7b079ce5880ba6e4487d8ed3c61a856ae429 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Mon, 29 Apr 2019 15:44:58 -0700 Subject: [PATCH 3/3] Upgrade CI to use Chrome V73 This backports https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/27762 into the 11-10-stable branch in the hopes it resolves a number of flaky tests. --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98fdda3593e..4eb17656edc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.11-git-2.18-chrome-71.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29" +image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.11-git-2.18-chrome-73.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29" include: - local: /lib/gitlab/ci/templates/Code-Quality.gitlab-ci.yml @@ -655,7 +655,7 @@ gitlab:setup-mysql: # Frontend-related jobs gitlab:assets:compile: <<: *dedicated-no-docs-pull-cache-job - image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-git-2.18-chrome-71.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1 + image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-git-2.18-chrome-73.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1 dependencies: - setup-test-env services: -- GitLab