summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-11-12 15:20:23 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-11-12 15:20:23 +0000
commit9ce0fa1fb594671a948478cf5b8a45c64b1267b6 (patch)
tree52e3d23a21e42458d326fa3d5be37906f0dd213f /app
parentf93539af26dcc76de97a4e647f75308f3164cbf6 (diff)
parenteaca2033d5145d8f679ecfe948a2d4ed909088ea (diff)
downloadgitlab-ce-9ce0fa1fb594671a948478cf5b8a45c64b1267b6.tar.gz
Merge branch 'mr-tree-filter-path-name' into 'master'
Changed diff tree filtering to path Closes #53781 See merge request gitlab-org/gitlab-ce!22978
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/diffs/components/tree_list.vue2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/components/tree_list.vue b/app/assets/javascripts/diffs/components/tree_list.vue
index 91052b303a6..ff1eb23cea3 100644
--- a/app/assets/javascripts/diffs/components/tree_list.vue
+++ b/app/assets/javascripts/diffs/components/tree_list.vue
@@ -35,7 +35,7 @@ export default {
if (search === '') return this.renderTreeList ? this.tree : this.allBlobs;
- return this.allBlobs.filter(f => f.name.toLowerCase().indexOf(search) >= 0);
+ return this.allBlobs.filter(f => f.path.toLowerCase().indexOf(search) >= 0);
},
rowDisplayTextKey() {
if (this.renderTreeList && this.search.trim() === '') {