diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -23,3 +23,4 @@ c5a2b7d0e4bbdebc4a62d7b624befe375207b659 d9aa3b27ac9f7e78359775c75fedf7bfece232f1 v4.9.1 4ba4d74981cec5d6b28b158f875a2540952c2f74 v4.10.0 0a6821cbd6b0b3c21503002f88800679fa35ab63 v4.10.1 +434ad90ec8d621f4416074b84f6e9ce03964defb v4.10.2 diff --git a/docs/release-notes/release-notes-4.10.2.rst b/docs/release-notes/release-notes-4.10.2.rst new file mode 100644 --- /dev/null +++ b/docs/release-notes/release-notes-4.10.2.rst @@ -0,0 +1,41 @@ +|RCE| 4.10.2 |RNS| +------------------ + +Release Date +^^^^^^^^^^^^ + +- 2017-11-08 + + +New Features +^^^^^^^^^^^^ + + + +General +^^^^^^^ + + + +Security +^^^^^^^^ + + + +Performance +^^^^^^^^^^^ + + + +Fixes +^^^^^ + + +- helpers: support for empty descriptions and metatags. + + + +Upgrade notes +^^^^^^^^^^^^^ + +- Changes helpers to support empty descriptions, no potential problems with upgrade. diff --git a/docs/release-notes/release-notes.rst b/docs/release-notes/release-notes.rst --- a/docs/release-notes/release-notes.rst +++ b/docs/release-notes/release-notes.rst @@ -9,6 +9,7 @@ Release Notes .. toctree:: :maxdepth: 1 + release-notes-4.10.2.rst release-notes-4.10.1.rst release-notes-4.10.0.rst release-notes-4.9.1.rst diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py --- a/rhodecode/lib/helpers.py +++ b/rhodecode/lib/helpers.py @@ -978,10 +978,10 @@ def extract_metatags(value): """ Extract supported meta-tags from given text value """ + tags = [] if not value: - return '' + return tags, '' - tags = [] for key, val in tags_paterns.items(): pat, replace_html = val tags.extend([(key, x.group()) for x in pat.finditer(value)]) diff --git a/rhodecode/tests/lib/test_libs.py b/rhodecode/tests/lib/test_libs.py --- a/rhodecode/tests/lib/test_libs.py +++ b/rhodecode/tests/lib/test_libs.py @@ -187,6 +187,14 @@ def test_age_in_future(age_args, expecte @pytest.mark.parametrize("sample, expected_tags", [ + # entry + (( + "" + ), + [ + + ]), + # entry (( "hello world [stale]" ),