Merge lp://staging/~cjohnston/qa-dashboard/custom-page-titles into lp://staging/qa-dashboard
Proposed by
Chris Johnston
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~cjohnston/qa-dashboard/custom-page-titles |
Merge into: | lp://staging/qa-dashboard |
Prerequisite: | lp://staging/~cjohnston/qa-dashboard/dashboard-smoke-2-smoke |
Diff against target: |
304 lines (+43/-12) (has conflicts) 17 files modified
bootspeed/templates/bootspeed/arch_overview.html (+3/-1) bootspeed/templates/bootspeed/image_chart.html (+2/-0) bootspeed/templates/bootspeed/image_list.html (+3/-1) bootspeed/templates/bootspeed/image_overview.html (+3/-1) bootspeed/templates/bootspeed/machine_data.html (+3/-1) bootspeed/templates/bootspeed/machine_raw_data.html (+3/-1) bootspeed/templates/bootspeed/overview.html (+2/-0) common/templates/404.html (+2/-0) common/templates/500.html (+2/-0) common/templates/layout.html (+1/-1) smoke/templates/api_help.html (+3/-1) smoke/templates/smoke/build_overview.html (+2/-1) smoke/templates/smoke/overview.html (+2/-0) smoke/templates/smoke/result_logs.html (+3/-1) smoke/templates/smoke/results.html (+4/-2) sru/templates/sru/overview.html (+3/-1) sru/templates/sru/overview_kernel.html (+2/-0) Conflict adding files to tests. Created directory. Conflict because tests is not versioned, but has versioned children. Versioned directory. Contents conflict in tests/test_bootspeed_api.py |
To merge this branch: | bzr merge lp://staging/~cjohnston/qa-dashboard/custom-page-titles |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Joe Talbott | Pending | ||
Review via email: mp+141850@code.staging.launchpad.net |
This proposal supersedes a proposal from 2012-12-20.
This proposal has been superseded by a proposal from 2013-01-04.
Commit message
Adds custom page titles to each page in the dashboard.
To post a comment you must log in.
Looks good, thanks.