From 1325f8cf2dce0f24403ea27c4ee58afd51fa3a8e Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 16 Jun 2022 03:09:36 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .gitlab/ci/docs.gitlab-ci.yml                               | 4 ++--
 .../ide/components/commit_sidebar/editor_header.vue         | 6 +++---
 db/migrate/20220520122755_unlock_delayed_project_removal.rb | 2 --
 doc/development/cicd/index.md                               | 6 ++++++
 doc/user/admin_area/appearance.md                           | 2 +-
 .../3_create/web_ide/open_fork_in_web_ide_spec.rb           | 4 +---
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml
index 9dcc305d32d..3af156e9bd0 100644
--- a/.gitlab/ci/docs.gitlab-ci.yml
+++ b/.gitlab/ci/docs.gitlab-ci.yml
@@ -44,7 +44,7 @@ docs-lint markdown:
     - .default-retry
     - .docs:rules:docs-lint
   # When updating the image version here, update it in /scripts/lint-doc.sh too.
-  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-docs/lint-markdown:alpine-3.15-vale-2.16.1-markdownlint-0.31.1
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-docs/lint-markdown:alpine-3.16-vale-2.17.0-markdownlint-0.31.1
   stage: lint
   needs: []
   script:
@@ -53,7 +53,7 @@ docs-lint markdown:
 docs-lint links:
   extends:
     - .docs:rules:docs-lint
-  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-docs/lint-html:alpine-3.15-ruby-2.7.5-e6a8a48a
+  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-docs/lint-html:alpine-3.16-ruby-2.7.6-0bc327a4
   stage: lint
   needs: []
   script:
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/editor_header.vue b/app/assets/javascripts/ide/components/commit_sidebar/editor_header.vue
index e5a8f5e79a0..7112c43bab8 100644
--- a/app/assets/javascripts/ide/components/commit_sidebar/editor_header.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/editor_header.vue
@@ -57,9 +57,9 @@ export default {
 </script>
 
 <template>
-  <div class="d-flex ide-commit-editor-header align-items-center">
-    <file-icon :file-name="activeFile.name" :size="16" class="mr-2" />
-    <strong class="mr-2">
+  <div class="gl-display-flex ide-commit-editor-header gl-align-items-center">
+    <file-icon :file-name="activeFile.name" :size="16" class="gl-mr-3" />
+    <strong class="gl-mr-3">
       <template v-if="activeFile.prevPath && activeFile.prevPath !== activeFile.path">
         {{ activeFile.prevPath }} &#x2192;
       </template>
diff --git a/db/migrate/20220520122755_unlock_delayed_project_removal.rb b/db/migrate/20220520122755_unlock_delayed_project_removal.rb
index dc76a95118b..aaecf601e2b 100644
--- a/db/migrate/20220520122755_unlock_delayed_project_removal.rb
+++ b/db/migrate/20220520122755_unlock_delayed_project_removal.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class UnlockDelayedProjectRemoval < Gitlab::Database::Migration[2.0]
-  disable_ddl_transaction!
-
   restrict_gitlab_migration gitlab_schema: :gitlab_main
 
   class ApplicationSetting < MigrationRecord
diff --git a/doc/development/cicd/index.md b/doc/development/cicd/index.md
index 8677d5b08e3..e8e116037de 100644
--- a/doc/development/cicd/index.md
+++ b/doc/development/cicd/index.md
@@ -15,6 +15,12 @@ Development guides that are specific to CI/CD are listed here:
 See the [CI/CD YAML reference documentation guide](cicd_reference_documentation_guide.md)
 to learn how to update the [reference page](../../ci/yaml/index.md).
 
+## Examples of CI/CD usage
+
+We maintain a [`ci-sample-projects`](https://gitlab.com/gitlab-org/ci-sample-projects) group, with projects that showcase
+examples of `.gitlab-ci.yml` for different use cases of GitLab CI/CD. They also cover specific syntax that could
+be used for different scenarios.
+
 ## CI Architecture overview
 
 The following is a simplified diagram of the CI architecture. Some details are left out to focus on
diff --git a/doc/user/admin_area/appearance.md b/doc/user/admin_area/appearance.md
index 29fadd6c7f1..4c3bdde223b 100644
--- a/doc/user/admin_area/appearance.md
+++ b/doc/user/admin_area/appearance.md
@@ -7,7 +7,7 @@ disqus_identifier: 'https://docs.gitlab.com/ee/customization/branded_login_page.
 
 # GitLab Appearance **(FREE SELF)**
 
-There are several options for customizing the appearance of a self-managed instance
+Several options are available for customizing the appearance of a self-managed instance
 of GitLab. To access these settings:
 
 1. On the top bar, select **Menu > Admin**.
diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/open_fork_in_web_ide_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide/open_fork_in_web_ide_spec.rb
index e9871a70560..046327f780b 100644
--- a/qa/qa/specs/features/browser_ui/3_create/web_ide/open_fork_in_web_ide_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/web_ide/open_fork_in_web_ide_spec.rb
@@ -3,9 +3,7 @@
 module QA
   RSpec.describe 'Create' do
     describe 'Open a fork in Web IDE',
-      # TODO: remove limitation to only run on main when the test is fixed
-      only: { pipeline: :main },
-      quarantine: {
+      skip: {
         issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/351696",
         type: :flaky
       } do