Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

1 files changed, 6 insertions, 4 deletions

diff --git a/.dockerignore b/.dockerignore
index b2aef4d31cd..e145f368cb1 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,9 +1,9 @@
 # `build_from_dir` can't find Dockerfile when `.dockerignore` is "*"
 # See https://github.com/swipely/docker-api/issues/484
-# Ignore all folders except qa/, config/initializers and the root of lib/ since
-# the files we need to build the QA image are in these folders.
-# Following are the files we need:
+# Ignore all folders except the following files we need to build the QA image:
 # - ./config/initializers/0_inject_enterprise_edition_module.rb
+# - ./config/feature_flags
+# - ./ee/config/feature_flags
 # - ./ee/app/models/license.rb
 # - ./lib/gitlab_edition.rb
 # - ./lib/gitlab/utils.rb
@@ -28,7 +28,9 @@
 /docker/
 /ee/bin/
 /ee/changelogs/
-/ee/config/
+/ee/config/events/
+/ee/config/metrics/
+/ee/config/routes/
 /ee/db/
 /ee/fixtures/
 /ee/lib/