diff options
| author | Phil Hughes <me@iamphill.com> | 2018-10-23 09:11:45 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-10-23 09:12:38 +0100 |
| commit | 687b96e82f58f29bca99f0bca45bbdc577d0047c (patch) | |
| tree | 2709551f3551562bd6f49d4a512431c697c2c191 | |
| parent | c7969568b707b100c349e344d34695bb538c35bf (diff) | |
| download | gitlab-ce-687b96e82f58f29bca99f0bca45bbdc577d0047c.tar.gz | |
Updated file tree icon
| -rw-r--r-- | app/assets/javascripts/diffs/components/tree_list.vue | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/mr-file-list.yml | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 7 |
4 files changed, 10 insertions, 5 deletions
diff --git a/app/assets/javascripts/diffs/components/tree_list.vue b/app/assets/javascripts/diffs/components/tree_list.vue index 1402cb510f7..21621491317 100644 --- a/app/assets/javascripts/diffs/components/tree_list.vue +++ b/app/assets/javascripts/diffs/components/tree_list.vue @@ -46,7 +46,7 @@ export default { ...mapActions('diffs', ['toggleTreeOpen', 'scrollToFile']), clearSearch() { this.search = ''; - this.toggleFocusSearch(false) + this.toggleFocusSearch(false); }, toggleRenderTreeList(toggle) { this.renderTreeList = toggle; @@ -124,7 +124,7 @@ export default { @click="toggleRenderTreeList(true)" > <icon - name="hamburger" + name="file-tree" /> </button> </div> diff --git a/changelogs/unreleased/mr-file-list.yml b/changelogs/unreleased/mr-file-list.yml index 6596a0dd3e3..0a2a5e0c1cc 100644 --- a/changelogs/unreleased/mr-file-list.yml +++ b/changelogs/unreleased/mr-file-list.yml @@ -1,5 +1,5 @@ --- title: Switch between tree list & file list in diffs file browser -merge_request: +merge_request: 22191 author: type: added diff --git a/package.json b/package.json index 5b0a92ee7a1..086617dc265 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "@babel/plugin-syntax-dynamic-import": "^7.0.0", "@babel/plugin-syntax-import-meta": "^7.0.0", "@babel/preset-env": "^7.1.0", - "@gitlab-org/gitlab-svgs": "^1.32.0", + "@gitlab-org/gitlab-svgs": "^1.33.0", "@gitlab-org/gitlab-ui": "^1.8.0", "autosize": "^4.0.0", "axios": "^0.17.1", diff --git a/yarn.lock b/yarn.lock index 544bd4a05bd..5da401c1d43 100644 --- a/yarn.lock +++ b/yarn.lock @@ -616,11 +616,16 @@ lodash "^4.17.10" to-fast-properties "^2.0.0" -"@gitlab-org/gitlab-svgs@^1.23.0", "@gitlab-org/gitlab-svgs@^1.32.0": +"@gitlab-org/gitlab-svgs@^1.23.0": version "1.32.0" resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.32.0.tgz#a65ab7724fa7d55be8e5cc9b2dbe3f0757432fd3" integrity sha512-L3o8dFUd2nSkVZBwh2hCJWzNzADJ3dTBZxamND8NLosZK9/ohNhccmsQOZGyMCUHaOzm4vifaaXkAXh04UtMKA== +"@gitlab-org/gitlab-svgs@^1.33.0": + version "1.33.0" + resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.33.0.tgz#068566e8ee00795f6f09f58236f08e1716f9f04a" + integrity sha512-8ajtUHk6gQ1xosL/CO5IzHSFM/t18hx5pfzQ3cd0VuQXcyR6QKGuXTLwbYdmJDYOw1Etoo5DqDWxPEClHyZpiA== + "@gitlab-org/gitlab-ui@^1.8.0": version "1.8.0" resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-ui/-/gitlab-ui-1.8.0.tgz#dee33d78f68c91644273dbd51734b796108263ee" |