diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py index 9207a923..d4fba35e 100644 --- a/rhodecode/lib/helpers.py +++ b/rhodecode/lib/helpers.py @@ -933,7 +933,7 @@ tags_paterns = OrderedDict(( '
')), ('see', (re.compile(r'\[see\ \=\>\ *([a-zA-Z0-9\/\=\?\&\ \:\/\.\-]*)\]'), - '')), + '')), ('url', (re.compile(r'\[url\ \=\>\ \[([a-zA-Z0-9\ \.\-\_]+)\]\((.*?)\)\]'), '')), @@ -942,9 +942,9 @@ tags_paterns = OrderedDict(( '')), ('ref', (re.compile(r'\[(requires|recommends|conflicts|base)\ \=\>\ *([a-zA-Z0-9\-\/]*)\]'), - '')), + '')), - ('state', (re.compile(r'\[(stable|featured|stale|dead|dev)\]'), + ('state', (re.compile(r'\[(stable|featured|stale|dead|dev|deprecated)\]'), '')), # label in grey diff --git a/rhodecode/public/css/tags.less b/rhodecode/public/css/tags.less index 0429aebd..a370a238 100644 --- a/rhodecode/public/css/tags.less +++ b/rhodecode/public/css/tags.less @@ -84,6 +84,7 @@ [tag="ref requires"] { &:extend(.tag3); } [tag="state dead"] { &:extend(.tag4); } +[tag="state deprecated"] { &:extend(.tag4); } [tag="ref conflicts"] { &:extend(.tag4); } diff --git a/rhodecode/templates/data_table/_dt_elements.mako b/rhodecode/templates/data_table/_dt_elements.mako index e642d11a..ffd6e0b7 100644 --- a/rhodecode/templates/data_table/_dt_elements.mako +++ b/rhodecode/templates/data_table/_dt_elements.mako @@ -12,6 +12,7 @@ ('state','[featured]'), ('state','[dev]'), ('state','[dead]'), + ('state','[deprecated]'), ('label','[personal]'), ('generic','[v2.0.0]'), diff --git a/rhodecode/tests/lib/test_libs.py b/rhodecode/tests/lib/test_libs.py index 01369781..b4658e08 100644 --- a/rhodecode/tests/lib/test_libs.py +++ b/rhodecode/tests/lib/test_libs.py @@ -279,12 +279,12 @@ def test_metatag_extraction(sample, expected_tags): (('license', '[license => MIT]'), ''), (('license', '[license => AGPLv3]'), ''), - (('ref', '[requires => RepoName]'), ''), - (('ref', '[recommends => GroupName]'), ''), - (('ref', '[conflicts => SomeName]'), ''), - (('ref', '[base => SomeName]'), ''), + (('ref', '[requires => RepoName]'), ''), + (('ref', '[recommends => GroupName]'), ''), + (('ref', '[conflicts => SomeName]'), ''), + (('ref', '[base => SomeName]'), ''), - (('see', '[see => http://rhodecode.com]'), ''), + (('see', '[see => http://rhodecode.com]'), ''), (('url', '[url => [linkName](https://rhodecode.com)]'), ''), (('url', '[url => [example link](https://rhodecode.com)]'), ''),