Merge branch 'remove-diff-tree-filtering-flag' into 'master'

Remove diff tree filtering feature flag

See merge request gitlab-org/gitlab-ce!26273

app/assets/javascripts/diffs/components/tree_list.vue

@@ -30,8 +30,9 @@ export default {
     filteredTreeList() {
       const search = this.search.toLowerCase().trim();
 
-      if (search === '' || this.$options.fuzzyFileFinderEnabled)
+      if (search === '') {
         return this.renderTreeList ? this.tree : this.allBlobs;
+      }
 
       return this.allBlobs.reduce((acc, folder) => {
         const tree = folder.tree.filter(f => f.path.toLowerCase().indexOf(search) >= 0);
@@ -51,13 +52,11 @@ export default {
     },
   },
   methods: {
-    ...mapActions('diffs', ['toggleTreeOpen', 'scrollToFile', 'toggleFileFinder']),
+    ...mapActions('diffs', ['toggleTreeOpen', 'scrollToFile']),
     clearSearch() {
       this.search = '';
     },
   },
-  shortcutKeyCharacter: `${/Mac/i.test(navigator.userAgent) ? '⌘' : 'Ctrl'}+P`,
-  diffTreeFiltering: gon.features && gon.features.diffTreeFiltering,
 };
 </script>
 
@@ -66,36 +65,21 @@ export default {
     <div class="append-bottom-8 position-relative tree-list-search d-flex">
       <div class="flex-fill d-flex">
         <icon name="search" class="position-absolute tree-list-icon" />
-        <template v-if="$options.diffTreeFiltering">
-          <input
-            v-model="search"
-            :placeholder="s__('MergeRequest|Filter files')"
-            type="search"
-            class="form-control"
-          />
-          <button
-            v-show="search"
-            :aria-label="__('Clear search')"
-            type="button"
-            class="position-absolute bg-transparent tree-list-icon tree-list-clear-icon border-0 p-0"
-            @click="clearSearch"
-          >
-            <icon name="close" />
-          </button>
-        </template>
-        <template v-else>
-          <button
-            type="button"
-            class="form-control text-left text-secondary"
-            @click="toggleFileFinder(true)"
-          >
-            {{ s__('MergeRequest|Search files') }}
-          </button>
-          <span
-            class="position-absolute text-secondary diff-tree-search-shortcut"
-            v-html="$options.shortcutKeyCharacter"
-          ></span>
-        </template>
+        <input
+          v-model="search"
+          :placeholder="s__('MergeRequest|Filter files')"
+          type="search"
+          class="form-control"
+        />
+        <button
+          v-show="search"
+          :aria-label="__('Clear search')"
+          type="button"
+          class="position-absolute bg-transparent tree-list-icon tree-list-clear-icon border-0 p-0"
+          @click="clearSearch"
+        >
+          <icon name="close" />
+        </button>
       </div>
     </div>
     <div :class="{ 'pt-0 tree-list-blobs': !renderTreeList }" class="tree-list-scroll">

app/controllers/projects/merge_requests_controller.rb

@@ -17,7 +17,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
   before_action :check_user_can_push_to_source_branch!, only: [:rebase]
 
   before_action only: [:show] do
-    push_frontend_feature_flag(:diff_tree_filtering, default_enabled: true)
     push_frontend_feature_flag(:expand_diff_full_file)
   end
 

locale/gitlab.pot

@@ -4872,9 +4872,6 @@ msgstr ""
 msgid "MergeRequest|No files found"
 msgstr ""
 
-msgid "MergeRequest|Search files"
-msgstr ""
-
 msgid "Merged"
 msgstr ""