Merge branch 'small-s-in-elasticsearch-in-code' into 'master'

Fix typo in code comments about Elasticsearch

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

app/models/note.rb

@@ -452,7 +452,7 @@ class Note < ApplicationRecord
 
     noteable_object&.touch
 
-    # We return the noteable object so we can re-use it in EE for ElasticSearch.
+    # We return the noteable object so we can re-use it in EE for Elasticsearch.
     noteable_object
   end
 

changelogs/unreleased/small-s-in-elasticsearch-in-code.yml

+---
+title: Fix typo in code comments about Elasticsearch
+merge_request: 30163
+author: Takuya Noguchi
+type: other

lib/gitlab/search/found_blob.rb

@@ -28,7 +28,7 @@ module Gitlab
         @binary_data = opts.fetch(:data, nil)
         @per_page = opts.fetch(:per_page, 20)
         @project = opts.fetch(:project, nil)
-        # Some caller does not have project object (e.g. elastic search),
+        # Some caller (e.g. Elasticsearch) does not have project object,
         # yet they can trigger many calls in one go,
         # causing duplicated queries.
         # Allow those to just pass project_id instead.