Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 11 deletions

diff --git a/doc/ci/components/index.md b/doc/ci/components/index.md
index 1b5f1c91c94..883624aeda2 100644
--- a/doc/ci/components/index.md
+++ b/doc/ci/components/index.md
@@ -190,13 +190,12 @@ After components are added to a components repository, they can immediately be [
 However, this repository is not discoverable. You must mark this project as a catalog resource to allow it to be visible in the CI Catalog
 so other users can discover it.
 
-To mark a project as a catalog resource, run the following [graphQL](../../api/graphql/index.md)
-mutation:
-
-```graphql
-mutation {
-    catalogResourcesCreate(input: { projectPath: "path-to-project"}) {
-      errors
-  }
-}
-```
+To mark a project as a catalog resource:
+
+1. On the top bar, select **Main menu > Projects** and find your project.
+1. On the left sidebar, select **Settings > General**.
+1. Expand **Visibility, project features, permissions**.
+1. Scroll down to **CI/CD Catalog resource** and select the toggle to mark the project as a catalog resource.
+
+NOTE:
+This action is not reversible.
diff --git a/doc/ci/runners/saas/linux_saas_runner.md b/doc/ci/runners/saas/linux_saas_runner.md
index d0ddbdfcaf0..be28197e681 100644
--- a/doc/ci/runners/saas/linux_saas_runner.md
+++ b/doc/ci/runners/saas/linux_saas_runner.md
@@ -180,7 +180,7 @@ sentry_dsn = "X"
     MachineOptions = [
       "google-project=PROJECT",
       "google-disk-size=25",
-      "google-machine-type=n1-standard-1",
+      "google-machine-type=n2d-standard-2",
       "google-username=core",
       "google-tags=gitlab-com,srm",
       "google-use-internal-ip",