summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuya Noguchi <takninnovationresearch@gmail.com>2019-06-28 19:58:04 +0900
committerTakuya Noguchi <takninnovationresearch@gmail.com>2019-06-28 20:01:15 +0900
commit7d76128de945c565e64f9e578be7543be0968e45 (patch)
tree933ced720eb81636432b09eb11deafd18e91550f
parentae68c7ea142b12fe179a4027b17d31ac6fb2649c (diff)
downloadgitlab-ce-7d76128de945c565e64f9e578be7543be0968e45.tar.gz
Fix typo in code comments about Elasticsearch
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
-rw-r--r--app/models/note.rb2
-rw-r--r--changelogs/unreleased/small-s-in-elasticsearch-in-code.yml5
-rw-r--r--lib/gitlab/search/found_blob.rb2
3 files changed, 7 insertions, 2 deletions
diff --git a/app/models/note.rb b/app/models/note.rb
index b55af7d9b5e..4e9ea146485 100644
--- a/app/models/note.rb
+++ b/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
diff --git a/changelogs/unreleased/small-s-in-elasticsearch-in-code.yml b/changelogs/unreleased/small-s-in-elasticsearch-in-code.yml
new file mode 100644
index 00000000000..20d7a822cde
--- /dev/null
+++ b/changelogs/unreleased/small-s-in-elasticsearch-in-code.yml
@@ -0,0 +1,5 @@
+---
+title: Fix typo in code comments about Elasticsearch
+merge_request: 30163
+author: Takuya Noguchi
+type: other
diff --git a/lib/gitlab/search/found_blob.rb b/lib/gitlab/search/found_blob.rb
index 01ce90c85f7..cfbe7f59a83 100644
--- a/lib/gitlab/search/found_blob.rb
+++ b/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.