Add latest changes from gitlab-org/gitlab@master

doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md

@@ -1142,6 +1142,33 @@ registry = Geo::PackageFileRegistry.find(registry_id)
 registry.replicator.send(:download)
 ```
 
+#### Verify package files on the secondary manually
+
+This will iterate over all package files on the secondary, looking at the
+`verification_checksum` stored in the database (which came from the primary)
+and then calculate this value on the secondary to check if they match. This
+won't change anything in the UI:
+
+```ruby
+# Run on secondary
+status = {}
+
+Packages::PackageFile.find_each do |package_file|
+  primary_checksum = package_file.verification_checksum
+  secondary_checksum = Packages::PackageFile.hexdigest(package_file.file.path)
+  verification_status = (primary_checksum == secondary_checksum)
+
+  status[verification_status.to_s] ||= []
+  status[verification_status.to_s] << package_file.id
+end
+
+# Count how many of each value we get
+status.keys.each {|key| puts "#{key} count: #{status[key].count}"}
+
+# See the output in its entirety
+status
+```
+
 ### Repository types newer than project/wiki repositories
 
 - `SnippetRepository`
@@ -1172,15 +1199,15 @@ registry = Geo::SnippetRepositoryRegistry.find(registry_id)
 registry.replicator.send(:sync_repository)
 ```
 
-### Generate Service Ping
+## Generate Service Ping
 
-#### Generate or get the cached Service Ping
+### Generate or get the cached Service Ping
 
 ```ruby
 Gitlab::UsageData.to_json
 ```
 
-#### Generate a fresh new Service Ping
+### Generate a fresh new Service Ping
 
 This will also refresh the cached Service Ping displayed in the admin area
 
@@ -1188,7 +1215,7 @@ This will also refresh the cached Service Ping displayed in the admin area
 Gitlab::UsageData.to_json(force_refresh: true)
 ```
 
-#### Generate and print
+### Generate and print
 
 Generates Service Ping data in JSON format.
 
@@ -1196,7 +1223,7 @@ Generates Service Ping data in JSON format.
 rake gitlab:usage_data:generate
 ```
 
-#### Generate and send Service Ping
+### Generate and send Service Ping
 
 Prints the metrics saved in `conversational_development_index_metrics`.
 

doc/install/requirements.md

@@ -218,7 +218,7 @@ Take for example the following scenarios:
     - number of cores: 4
     - memory limit: (4 - 1.5) = 2.5 
   ]
-  ``
+  ```
 
   So, the highest from 2 and 2 is 2.
 

doc/operations/error_tracking.md

@@ -26,7 +26,7 @@ least Maintainer [permissions](../user/permissions.md) to enable the Sentry inte
 1. Sign up to Sentry.io or [deploy your own](#deploying-sentry) Sentry instance.
 1. [Create](https://docs.sentry.io/product/sentry-basics/guides/integrate-frontend/create-new-project/) a new Sentry project. For each GitLab project that you want to integrate, we recommend that you create a new Sentry project.
 1. [Find or generate](https://docs.sentry.io/api/auth/) a Sentry auth token for your Sentry project.
-   Make sure to give the token at least the following scopes: `event:read` and `project:read`.
+   Make sure to give the token at least the following scopes: `event:read`, `project:read`, and `event:write` (for resolving events).
 1. In GitLab, navigate to your project's **Monitor > Error Tracking** page, and
    click **Enable Error Tracking**.
 1. Navigate to your project's **Settings > Monitor**. In the **Error Tracking** section,