Merge branch 'stable-2.6'

* stable-2.6:
  Show 'No Differences' if diff is empty
  Add theme that displays Diffy on the left side of the top menu
  Support '${project}' token in dashboard title and description
  Minor corrections in the 2.6 release notes
This commit is contained in:
Shawn Pearce
2013-04-05 11:54:38 -07:00
8 changed files with 83 additions and 31 deletions

View File

@@ -160,8 +160,8 @@ class DashboardsCollection implements
DashboardInfo info = new DashboardInfo(refName, path);
info.project = project;
info.definingProject = definingProject.getName();
info.title = config.getString("dashboard", null, "title");
info.description = config.getString("dashboard", null, "description");
info.title = replace(project, config.getString("dashboard", null, "title"));
info.description = replace(project, config.getString("dashboard", null, "description"));
info.foreach = config.getString("dashboard", null, "foreach");
if (setDefault) {