diff options
| author | John Jarvis <jarv@gitlab.com> | 2019-06-03 12:58:12 +0000 |
|---|---|---|
| committer | John Jarvis <jarv@gitlab.com> | 2019-06-03 12:58:12 +0000 |
| commit | 58854b7741f06e16c1687f68300a598ec87c9962 (patch) | |
| tree | 3df02e3c49b332d9f6a96610686db96a5c9dc4e6 | |
| parent | 79e40c66bc0e6e628dc46483d7a6da2b6f70198e (diff) | |
| parent | a7fa7b079ce5880ba6e4487d8ed3c61a856ae429 (diff) | |
| download | gitlab-ce-58854b7741f06e16c1687f68300a598ec87c9962.tar.gz | |
Merge branch 'sh-11-10-upgrade-chrome-v73' into '11-10-stable-patch-6'
Upgrade CI to use Chrome V73
See merge request gitlab-org/gitlab-ce!27863
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/diffs/workers/tree_worker.js | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/search.scss | 2 |
3 files changed, 9 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: 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 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; |