Automatic merge of gitlab-org/gitlab-ce master

Gemfile

@@ -324,7 +324,7 @@ group :metrics do
   gem 'influxdb', '~> 0.2', require: false
 
   # Prometheus
-  gem 'prometheus-client-mmap', '~> 0.9.4'
+  gem 'prometheus-client-mmap', '~> 0.9.6'
   gem 'raindrops', '~> 0.18'
 end
 

Gemfile.lock

@@ -683,7 +683,7 @@ GEM
       parser
       unparser
     procto (0.0.3)
-    prometheus-client-mmap (0.9.4)
+    prometheus-client-mmap (0.9.6)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -1215,7 +1215,7 @@ DEPENDENCIES
   peek-redis (~> 1.2.0)
   pg (~> 1.1)
   premailer-rails (~> 1.9.7)
-  prometheus-client-mmap (~> 0.9.4)
+  prometheus-client-mmap (~> 0.9.6)
   pry-byebug (~> 3.5.1)
   pry-rails (~> 0.3.4)
   puma (~> 3.12)

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

doc/development/contributing/issue_workflow.md

@@ -43,6 +43,10 @@ The descriptions on the [labels page][labels-page] explain what falls under each
 Subject labels are labels that define what area or feature of GitLab this issue
 hits. They are not always necessary, but very convenient.
 
+Subject labels are now used to infer and apply relevant group and devops stage
+labels. Please apply them whenever possible to facilitate accurate matching.
+Please refer to [this merge request][inferred-labels] for more information.
+
 Examples of subject labels are ~wiki, ~ldap, ~api,
 ~issues, ~"merge requests", ~labels, and ~"Container Registry".
 
@@ -444,3 +448,4 @@ A recent example of this was the issue for
 [labels-page]: https://gitlab.com/gitlab-org/gitlab-ce/labels
 [ce-tracker]: https://gitlab.com/gitlab-org/gitlab-ce/issues
 [ee-tracker]: https://gitlab.com/gitlab-org/gitlab-ee/issues
+[inferred-labels]: https://gitlab.com/gitlab-org/quality/triage-ops/merge_requests/155

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.