diff --git a/UPDATING.md b/UPDATING.md
index fbea0b3af9d88..336459bad87ae 100644
--- a/UPDATING.md
+++ b/UPDATING.md
@@ -25,6 +25,7 @@ assists users migrating to a new version.
**Table of contents**
+- [Airflow 1.10.11](#airflow-11011)
- [Airflow 1.10.10](#airflow-11010)
- [Airflow 1.10.9](#airflow-1109)
- [Airflow 1.10.8](#airflow-1108)
@@ -59,6 +60,12 @@ https://developers.google.com/style/inclusive-documentation
-->
+## Airflow 1.10.11
+
+### Use NULL as default value for dag.description
+
+Now use NULL as default value for dag.description in dag table
+
## Airflow 1.10.10
### Setting Empty string to a Airflow Variable will return an empty string
diff --git a/airflow/models/dag.py b/airflow/models/dag.py
index 4d7eef86b1126..3f46bf6f9d18d 100644
--- a/airflow/models/dag.py
+++ b/airflow/models/dag.py
@@ -215,7 +215,7 @@ class DAG(BaseDag, LoggingMixin):
def __init__(
self,
dag_id, # type: str
- description='', # type: str
+ description=None, # type: Optional[str]
schedule_interval=timedelta(days=1), # type: Optional[ScheduleInterval]
start_date=None, # type: Optional[datetime]
end_date=None, # type: Optional[datetime]
diff --git a/airflow/www/templates/airflow/dag.html b/airflow/www/templates/airflow/dag.html
index 583e2c7706ce6..89d3ce072dbc3 100644
--- a/airflow/www/templates/airflow/dag.html
+++ b/airflow/www/templates/airflow/dag.html
@@ -35,7 +35,8 @@
SUBDAG: {{ dag.dag_id }}
{% else %}
- DAG: {{ dag.dag_id }} {{ dag.description_unicode }}
+ DAG: {{ dag.dag_id }}
+ {{ dag.description_unicode[0:150] + '...' if dag.description_unicode and dag.description_unicode|length > 150 else dag.description_unicode|default('', true) }}
{% endif %}
{% if root %}
ROOT: {{ root }}
diff --git a/airflow/www/templates/airflow/dags.html b/airflow/www/templates/airflow/dags.html
index 5c3806d56700a..ec4e4d0990b5e 100644
--- a/airflow/www/templates/airflow/dags.html
+++ b/airflow/www/templates/airflow/dags.html
@@ -81,8 +81,9 @@ DAGs
-
- {{ dag.dag_id }}
+
+ {{ dag.dag_id }}
|
diff --git a/airflow/www_rbac/templates/airflow/dag.html b/airflow/www_rbac/templates/airflow/dag.html
index 2f604db5eec32..dda7cf939f1bd 100644
--- a/airflow/www_rbac/templates/airflow/dag.html
+++ b/airflow/www_rbac/templates/airflow/dag.html
@@ -32,7 +32,8 @@
SUBDAG: {{ dag.dag_id }}
{% else %}
- DAG: {{ dag.dag_id }} {{ dag.description_unicode }}
+ DAG: {{ dag.dag_id }}
+ {{ dag.description_unicode[0:150] + '...' if dag.description_unicode and dag.description_unicode|length > 150 else dag.description_unicode|default('', true) }}
{% endif %}
{% if root %}
ROOT: {{ root }}
diff --git a/airflow/www_rbac/templates/airflow/dags.html b/airflow/www_rbac/templates/airflow/dags.html
index ce5c559334a1b..91ac604aab672 100644
--- a/airflow/www_rbac/templates/airflow/dags.html
+++ b/airflow/www_rbac/templates/airflow/dags.html
@@ -102,7 +102,8 @@ DAGs
-
+
{{ dag.dag_id }}
|