From 8c726c7487db581867ade785f798d84315cb787e Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 4 Oct 2019 00:06:03 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .dockerignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.dockerignore')

diff --git a/.dockerignore b/.dockerignore
index d5568619169..2d1af2c25fc 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,6 +3,7 @@
 # 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:
+# - ./config/light_settings.rb
 # - ./config/initializers/0_inject_enterprise_edition_module.rb
 # - ./ee/app/models/license.rb
 # - ./lib/gitlab.rb
-- 
cgit v1.2.3