kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
Fix typo in code comments about Elasticsearch

See merge request gitlab-org/gitlab-ce!30163
This commit is contained in:
Rémy Coutable 2019-06-28 13:37:43 +00:00
commit 7b27e067ca
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/note.rb
View file

@ -452,7 +452,7 @@ class Note < ApplicationRecord
noteable_object&.touch 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 noteable_object
end end

5
changelogs/unreleased/small-s-in-elasticsearch-in-code.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Fix typo in code comments about Elasticsearch
merge_request: 30163
author: Takuya Noguchi
type: other

2
lib/gitlab/search/found_blob.rb
View file

@ -28,7 +28,7 @@ module Gitlab
@binary_data = opts.fetch(:data, nil) @binary_data = opts.fetch(:data, nil)
@per_page = opts.fetch(:per_page, 20) @per_page = opts.fetch(:per_page, 20)
@project = opts.fetch(:project, nil) @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, # yet they can trigger many calls in one go,
# causing duplicated queries. # causing duplicated queries.
# Allow those to just pass project_id instead. # Allow those to just pass project_id instead.