Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 29 insertions, 7 deletions

diff --git a/.yamllint b/.yamllint
index 2fddf9ee3c4..5b49a617a57 100644
--- a/.yamllint
+++ b/.yamllint
@@ -2,6 +2,15 @@
 
 extends: default
 
+yaml-files:
+  # defaults
+  - '*.yaml'
+  - '*.yml'
+  - '.yamllint'
+  # match more extensions
+  - '*.yaml.*'
+  - '*.yml.*'
+
 # Ideally, we should have nothing in this ignore section.
 #
 # Please consider removing entries below by fixing them.
@@ -19,19 +28,32 @@ ignore: |
   # Broken on purpose (for testing)
   spec/fixtures/lib/gitlab/metrics/dashboard/broken_yml_syntax.yml
 
+  # Dynamic YAML files have syntax errors sometimes.
+  *.erb
+
+  # Vim temporary files.
+  *.sw[pon]
+
+  # Zipped files (by e.g. asset pipeline)
+  *.gz
+  *.bz2
+
   #### Folders ####
   node_modules/
   tmp/
 
-# Why disabling all of those rules?
-#
-# For the scope of https://gitlab.com/gitlab-org/gitlab/-/issues/359968,
-# we would like to catch syntax errors as soon as possible.
-# Style "errors" are not as important right now, but they should ideally be added later on.
+# In CI some YAML files are linted using different rules.
+# See `.gitlab/ci/yaml.gitlab-ci.yml`.
 #
-# Please consider enabling a rule, and fixing the issues you'll see in an MR.
+# https://gitlab.com/gitlab-org/gitlab/-/issues/385693 tracks to enable all
+# rules below:
 rules:
-  braces: disable
+  braces:
+    min-spaces-inside: 1
+    max-spaces-inside: 1
+    min-spaces-inside-empty: 0
+    max-spaces-inside-empty: 0
+
   colons: disable
   comments-indentation: disable
   comments: disable