diff --git a/etc/default_data.json b/etc/default_data.json index b8c1a9085..657906428 100644 --- a/etc/default_data.json +++ b/etc/default_data.json @@ -13697,6 +13697,18 @@ "tag_to": "HEAD", "release_name": "Liberty", "tag_from": "2015.1.0rc1" + }, + { + "branch": "feature/pecan", + "tag_from": "2015.1.0rc1", + "tag_to": "HEAD", + "release_name": "Liberty" + }, + { + "branch": "feature/qos", + "tag_from": "2015.1.0rc1", + "tag_to": "HEAD", + "release_name": "Liberty" } ], "uri": "git://git.openstack.org/openstack/neutron.git", diff --git a/stackalytics/dashboard/templates/_macros/activity_log.html b/stackalytics/dashboard/templates/_macros/activity_log.html index 88fb059b3..87b05c616 100644 --- a/stackalytics/dashboard/templates/_macros/activity_log.html +++ b/stackalytics/dashboard/templates/_macros/activity_log.html @@ -79,7 +79,11 @@ show_record_type=True, show_user_gravatar=True, gravatar_size=32, show_all=True) {%else%}
{%html author_link %} ({%html company_link %})
{%/if%} -
${date_str} in {%html module_link%}
+
${date_str} in {%html module_link%} + {%if record_type == "mark" || record_type == "review" || record_type == "patch" %} + {%if branch != "master" %}(${branch}){%/if%} + {%/if%} +
{%if record_type == "commit" %}
Commit “${subject}”