Merge pull request #34375 from github/repo-sync

Repo sync

data/release-notes/enterprise-server/3-13/3.yml

@@ -117,8 +117,6 @@ sections:
       When restoring data originally backed up from a 3.13 appliance onto a 3.13 appliance, the elasticsearch indices need to be reindexed before some of the data will show up. This happens via a nightly scheduled job.  It can also be forced by running `/usr/local/share/enterprise/ghe-es-search-repair`.
     - |
       The global search bar does not have suggestions enabled due to the redesigned navigation and pending new search experience.
-    - |
-      Hotpatching in Azure fails with a `rsync` error.
     - |
       When restoring from a backup snapshot, a large number of `mapper_parsing_exception` errors may be displayed.
     - |

src/search/middleware/contextualize.js

@@ -46,12 +46,9 @@ export default async function contextualizeSearch(req, res, next) {
     }
   }
 
-  // Feature flag
-  if (
-    ['enterprise-cloud', 'enterprise-server'].includes(req.context.currentVersion.split('@')[0])
-  ) {
-    search.aggregate = ['toplevel']
-  }
+  // This enables so that when the search is sent to Elasticsearch
+  // it will request an aggregate by these keyword fields.
+  search.aggregate = ['toplevel']
 
   req.context.search = { search, validationErrors }