Add latest changes from gitlab-org/gitlab@master

7 files changed, 41 insertions, 8 deletions

diff --git a/doc/administration/housekeeping.md b/doc/administration/housekeeping.md
index eedd0fb8293..178fc438df2 100644
--- a/doc/administration/housekeeping.md
+++ b/doc/administration/housekeeping.md
@@ -48,7 +48,7 @@ It is ultimately performed by the Gitaly RPC `FetchIntoObjectPool`.
 
 This is the current call stack by which it is invoked:
 
-1. `Projects::HousekeepingService#execute_gitlab_shell_gc`
+1. `Repositories::HousekeepingService#execute_gitlab_shell_gc`
 1. `GitGarbageCollectWorker#perform`
 1. `Projects::GitDeduplicationService#fetch_from_source`
 1. `ObjectPool#fetch`
diff --git a/doc/administration/monitoring/prometheus/gitlab_exporter.md b/doc/administration/monitoring/prometheus/gitlab_exporter.md
index 8e4d87cfa78..5add842bccc 100644
--- a/doc/administration/monitoring/prometheus/gitlab_exporter.md
+++ b/doc/administration/monitoring/prometheus/gitlab_exporter.md
@@ -30,3 +30,27 @@ To enable the GitLab exporter in an Omnibus GitLab instance:
 
 Prometheus automatically begins collecting performance data from
 the GitLab exporter exposed at `localhost:9168`.
+
+## Use a different Rack server
+
+>- Introduced in [Omnibus GitLab 13.8](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/4896).
+>- WEBrick is now the default Rack server instead of Puma.
+
+By default, the GitLab exporter runs on [WEBrick](https://github.com/ruby/webrick), a single-threaded Ruby web server.
+You can choose a different Rack server that better matches your performance needs.
+For instance, in multi-node setups that contain a large number of Prometheus scrapers
+but only a few monitoring nodes, you may decide to run a multi-threaded server such as Puma instead.
+
+To change the Rack server to Puma:
+
+1. Edit `/etc/gitlab/gitlab.rb`.
+1. Add, or find and uncomment, the following line, and set it to `puma`:
+
+   ```ruby
+   gitlab_exporter['server_name'] = 'puma'
+   ```
+
+1. Save the file and [reconfigure GitLab](../../restart_gitlab.md#omnibus-gitlab-reconfigure)
+   for the changes to take effect.
+
+The supported Rack servers are `webrick` and `puma`.
diff --git a/doc/administration/raketasks/check.md b/doc/administration/raketasks/check.md
index ff39207f7e1..41defd89df5 100644
--- a/doc/administration/raketasks/check.md
+++ b/doc/administration/raketasks/check.md
@@ -214,7 +214,7 @@ If the issue persists, try triggering `gc` via the
 
 ```ruby
 p = Project.find_by_path("project-name")
-Projects::HousekeepingService.new(p, :gc).execute
+Repositories::HousekeepingService.new(p, :gc).execute
 ```
 
 ### Delete references to missing remote uploads
diff --git a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md
index f1e976d969a..4a112733bfa 100644
--- a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md
+++ b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md
@@ -743,7 +743,7 @@ m.project.try(:ci_service)
 ```ruby
 project = Project.find_by_full_path 'group/project'
 content = project.repository.gitlab_ci_yml_for(project.repository.root_ref_sha)
-Gitlab::Ci::YamlProcessor.validation_message(content,  user: User.first)
+Gitlab::Ci::Lint.new(project: project,  current_user: User.first).validate(content)
 ```
 
 ### Disable AutoDevOps on Existing Projects
diff --git a/doc/api/notes.md b/doc/api/notes.md
index 885412e39a9..fe20d5ab353 100644
--- a/doc/api/notes.md
+++ b/doc/api/notes.md
@@ -11,7 +11,7 @@ Notes are comments on:
 - Snippets
 - Issues
 - Merge requests
-- Epics **(ULTIMATE)**
+- Epics **(PREMIUM)**
 
 This includes system notes, which are notes about changes to the object (for example, when an
 assignee changes, GitLab posts a system note).
diff --git a/doc/api/search.md b/doc/api/search.md
index bfa5eb576dc..584b2cbb837 100644
--- a/doc/api/search.md
+++ b/doc/api/search.md
@@ -998,7 +998,9 @@ Example response:
 ]
 ```
 
-### Scope: notes
+### Scope: notes **(STARTER)**
+
+This scope is available only if [Elasticsearch](../integration/elasticsearch.md) is enabled.
 
 ```shell
 curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/6/search?scope=notes&search=maxime"
@@ -1030,7 +1032,9 @@ Example response:
 ]
 ```
 
-### Scope: wiki_blobs
+### Scope: wiki_blobs **(STARTER)**
+
+This scope is available only if [Elasticsearch](../integration/elasticsearch.md) is enabled.
 
 Filters are available for this scope:
 
@@ -1074,7 +1078,9 @@ Example response:
 NOTE:
 `filename` is deprecated in favor of `path`. Both return the full path of the file inside the repository, but in the future `filename` will be only the filename and not the full path. For details, see [issue 34521](https://gitlab.com/gitlab-org/gitlab/-/issues/34521).
 
-### Scope: commits
+### Scope: commits **(STARTER)**
+
+This scope is available only if [Elasticsearch](../integration/elasticsearch.md) is enabled.
 
 ```shell
 curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/6/search?scope=commits&search=bye"
@@ -1105,7 +1111,9 @@ Example response:
 ]
 ```
 
-### Scope: blobs
+### Scope: blobs **(STARTER)**
+
+This scope is available only if [Elasticsearch](../integration/elasticsearch.md) is enabled.
 
 Filters are available for this scope:
 
diff --git a/doc/development/code_review.md b/doc/development/code_review.md
index 992dfb98e40..fe395dc2304 100644
--- a/doc/development/code_review.md
+++ b/doc/development/code_review.md
@@ -24,6 +24,7 @@ uncovered edge cases.
 The default approach is to choose a reviewer from your group or team for the first review.
 This is only a recommendation and the reviewer may be from a different team.
 However, it is recommended to pick someone who is a [domain expert](#domain-experts).
+If your merge request touches more than one domain (for example, Dynamic Analysis and GraphQL), ask for reviews from an expert from each domain. 
 
 You can read more about the importance of involving reviewer(s) in the section on the responsibility of the author below.