From 077601f97ae593216bfe8652c2bd48aeb587c354 Mon Sep 17 00:00:00 2001 From: John Whitlock Date: Fri, 12 May 2017 11:02:59 -0500 Subject: [PATCH] bug 1352232: Add SCL3 section to ignore files Some files should not be used in development, but are still used in the SCL3 deployment process. --- .dockerignore | 16 ++++++++++------ .gitignore | 14 +++++++++----- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.dockerignore b/.dockerignore index aebc6531439..0c2246847af 100644 --- a/.dockerignore +++ b/.dockerignore @@ -25,7 +25,6 @@ coverage.xml # Translations *.mo -*.pot # Sphinx documentation docs/_build/ @@ -61,8 +60,6 @@ docker-compose.locust.yml humans.txt james.ini kuma/static/js/libs/ckeditor/source/ckbuilder -kumascript_settings_local.json -kumascript_settings_local.json* mdn_sample_db.sql mdn_sample_db.sql.gz mdntests/ @@ -72,11 +69,18 @@ media/uploads media/revision.txt media/kumascript-revision.txt node_modules/ -settings_local.py -settings_local.py* /static/ tmp +# SCL3-specific files +# TODO: Remove when AWS move is complete +kumascript_settings_local.json +kumascript_settings_local.json* +!kumascript_settings_local.json-dist +settings_local.py +settings_local.py* +webroot/.htaccess + # Selenium geckodriver.log @@ -85,7 +89,6 @@ geckodriver.log logs/ xfers/* wheelhouse -webroot/.htaccess uploads/ kumascript.log @@ -115,3 +118,4 @@ Dockerfile* kumascript/* # Rebuilt in Docker locale/*/LC_MESSAGES/*.mo +*.pot diff --git a/.gitignore b/.gitignore index b7f55bc2df8..d960cdae7e1 100644 --- a/.gitignore +++ b/.gitignore @@ -58,8 +58,6 @@ docker-compose.locust.yml humans.txt james.ini kuma/static/js/libs/ckeditor/source/ckbuilder -kumascript_settings_local.json -kumascript_settings_local.json* mdn_sample_db.sql mdn_sample_db.sql.gz mdntests/ @@ -69,11 +67,18 @@ media/uploads media/revision.txt media/kumascript-revision.txt node_modules/ -settings_local.py -settings_local.py* /static/ tmp +# SCL3-specific files +# TODO: Remove when AWS move is complete +kumascript_settings_local.json +kumascript_settings_local.json* +!kumascript_settings_local.json-dist +settings_local.py +settings_local.py* +webroot/.htaccess + # Selenium geckodriver.log @@ -82,6 +87,5 @@ geckodriver.log logs/ xfers/* wheelhouse -webroot/.htaccess uploads/ kumascript.log