diff --git a/.gitignore b/.gitignore
index 4427d37ae61dc..8ddf75a129b58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ secrets.py
 airflow.db
 unittests.db
 
+
 # Airflow temporary artifacts
 airflow/git_version
 airflow/www/static/coverage/
diff --git a/airflow/config_templates/config.yml b/airflow/config_templates/config.yml
index 2fc180c6a08b2..289b3c0585fea 100644
--- a/airflow/config_templates/config.yml
+++ b/airflow/config_templates/config.yml
@@ -456,6 +456,17 @@
       type: string
       example: ~
       default: "http://localhost:8080"
+- name: debug
+  description: ~
+  options:
+    - name: fail_fast
+      description: |
+        Used only with DebugExecutor. If set to True DAG will fail with first
+        failed task. Helpful for debugging purposes.
+      version_added: ~
+      type: string
+      example: ~
+      default: "False"
 - name: api
   description: ~
   options:
diff --git a/airflow/config_templates/default_airflow.cfg b/airflow/config_templates/default_airflow.cfg
index 5ec5042bd58d3..7fa7305de4606 100644
--- a/airflow/config_templates/default_airflow.cfg
+++ b/airflow/config_templates/default_airflow.cfg
@@ -237,6 +237,11 @@ api_client = airflow.api.client.local_client
 # So api will look like: ``http://localhost:8080/myroot/api/experimental/...``
 endpoint_url = http://localhost:8080
 
+[debug]
+# Used only with DebugExecutor. If set to True DAG will fail with first
+# failed task. Helpful for debugging purposes.
+fail_fast = False
+
 [api]
 # How to authenticate users of the API
 auth_backend = airflow.api.auth.backend.default