Add latest changes from gitlab-org/gitlab@master

3 files changed, 21 insertions, 4 deletions

diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index 1d2f94b616d..76f5d8f3eee 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -335,7 +335,9 @@ rspec fast_spec_helper:
     - .rspec-base-pg12
     - .rails:rules:ee-and-foss-fast_spec_helper
   script:
-    - bin/rspec spec/fast_spec_helper.rb
+    - fast_spec_helper_specs=$(git grep -l -E '^require.*fast_spec_helper')
+    # Load fast_spec_helper as well just in case there are no specs available.
+    - bin/rspec --dry-run spec/fast_spec_helper.rb $fast_spec_helper_specs
 
 rspec fast_spec_helper minimal:
   extends:
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index bf097ae660c..973d022c197 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -940,6 +940,8 @@
     - <<: *if-merge-request
       changes: *core-backend-patterns
     - <<: *if-merge-request
+      changes: *workhorse-patterns
+    - <<: *if-merge-request
       changes: *ci-patterns
     - <<: *if-automated-merge-request
       changes: *code-backstage-patterns
@@ -963,6 +965,9 @@
       changes: *core-backend-patterns
       when: never
     - <<: *if-merge-request
+      changes: *workhorse-patterns
+      when: never
+    - <<: *if-merge-request
       changes: *ci-patterns
       when: never
     - <<: *if-merge-request
@@ -1132,6 +1137,8 @@
     - <<: *if-merge-request
       changes: *core-backend-patterns
     - <<: *if-merge-request
+      changes: *workhorse-patterns
+    - <<: *if-merge-request
       changes: *ci-patterns
     - <<: *if-automated-merge-request
       changes: *code-backstage-patterns
@@ -1157,6 +1164,9 @@
       changes: *core-backend-patterns
       when: never
     - <<: *if-merge-request
+      changes: *workhorse-patterns
+      when: never
+    - <<: *if-merge-request
       changes: *ci-patterns
       when: never
     - <<: *if-merge-request
@@ -1284,6 +1294,8 @@
     - <<: *if-merge-request
       changes: *core-backend-patterns
     - <<: *if-merge-request
+      changes: *workhorse-patterns
+    - <<: *if-merge-request
       changes: *ci-patterns
     - <<: *if-automated-merge-request
       changes: *code-backstage-patterns
@@ -1308,6 +1320,9 @@
       changes: *core-backend-patterns
       when: never
     - <<: *if-merge-request
+      changes: *workhorse-patterns
+      when: never
+    - <<: *if-merge-request
       changes: *ci-patterns
       when: never
     - <<: *if-merge-request-labels-as-if-foss
diff --git a/.gitlab/merge_request_templates/Deprecations.md b/.gitlab/merge_request_templates/Deprecations.md
index e0b4f127e4a..38d956a8e90 100644
--- a/.gitlab/merge_request_templates/Deprecations.md
+++ b/.gitlab/merge_request_templates/Deprecations.md
@@ -39,7 +39,7 @@ They are frequently updated, and everyone should make sure they are aware of the
 - [ ] If the deprecation is a [breaking change](https://about.gitlab.com/handbook/product/gitlab-the-product/#breaking-change), add label `breaking change`.
 - [ ] Follow the process to [create a deprecation YAML file](https://about.gitlab.com/handbook/marketing/blog/release-posts/#creating-a-deprecation-entry).
 - [ ] Add reviewers by the 10th.
-- [ ] When ready to be merged and not later than the 15th, add the ~ready label and @ message the TW for final review and merge.
+- [ ] When ready to be merged and not later than the 15th, add the `~ready` label and @ message the TW for final review and merge.
 
 ## Reviewers
 
@@ -68,7 +68,7 @@ yourself as a reviewer if it's not ready for merge yet.
 - [ ] Title:
   - Length limit: 7 words (not including articles or prepositions).
   - Capitalization: ensure the title is [sentence cased](https://design.gitlab.com/content/punctuation#case).
-  - No Markdown `` `code` `` formatting in the title, as it doesn't render correctly in the release post.
+  - Rewrite to exclude the words `deprecation`, `deprecate`, `removal`, and `remove` if necessary.
 - [ ] Consistency:
   - Ensure that all resources (docs, deprecation, etc.) refer to the feature with the same term / feature name.
 - [ ] Content:
@@ -98,4 +98,4 @@ must be updated before this MR is merged:
 1. Commit the updated file and push the changes.
 1. Set the MR to merge when the pipeline succeeds (or merge if the pipeline is already complete).
 
-If you have trouble running the rake task, check the [troubleshooting steps](https://about.gitlab.com/handbook/marketing/blog/release-posts/#deprecation-rake-task-troubleshooting).
+If you have trouble running the Rake task, check the [troubleshooting steps](https://about.gitlab.com/handbook/marketing/blog/release-posts/#deprecation-rake-task-troubleshooting).