Helipad

Merge lp:~cjohnston/helipad/ci-remove-future-urls into lp:helipad/ci

  1. ci-remove-future-urls
  2. Merge into ci
Proposed by Chris Johnston
Status: Merged
Approved by: Francis Ginther
Approved revision: 48
Merged at revision: 48
Proposed branch: lp:~cjohnston/helipad/ci-remove-future-urls
Merge into: lp:helipad/ci
Diff against target: 59 lines (+0/-6)
6 files modified
templates/ci/cu2d_results.html (+0/-1)
templates/ci/daily_release_overview.html (+0/-1)
templates/ci/job.html (+0/-1)
templates/ci/project_detail.html (+0/-1)
templates/ci/project_list.html (+0/-1)
templates/ci/stack_list.html (+0/-1)
To merge this branch: bzr merge lp:~cjohnston/helipad/ci-remove-future-urls
Reviewer Review Type Date Requested Status
Francis Ginther Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+190522@code.launchpad.net

Commit message

Remove future proofing required prior to the Django 1.5 switch

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:48
http://10.97.0.26:8080/job/helipad-ci-ci/74/
Executed test runs:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/helipad-ci-ci/74/rebuild

review: Approve (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Approve.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/ci/cu2d_results.html'
2--- templates/ci/cu2d_results.html 2013-09-27 15:09:35 +0000
3+++ templates/ci/cu2d_results.html 2013-10-11 02:50:07 +0000
4@@ -1,5 +1,4 @@
5 {% extends "ci/ci_layout.html" %}
6-{% load url from future %}
7 {% load dashboard_extras ci_extras percentage %}
8
9 {% block page_name %}Daily release status for {% if show_filter %}{{ show_filter }}{% else %}all stacks{% endif %}{% endblock %}
10
11=== modified file 'templates/ci/daily_release_overview.html'
12--- templates/ci/daily_release_overview.html 2013-09-19 21:56:00 +0000
13+++ templates/ci/daily_release_overview.html 2013-10-11 02:50:07 +0000
14@@ -1,5 +1,4 @@
15 {% extends "ci/ci_layout.html" %}
16-{% load url from future %}
17 {% load dashboard_extras ci_extras percentage %}
18
19 {% block page_name %}Daily release status for {% if show_filter %}{{ show_filter }}{% else %}all stacks{% endif %}{% endblock %}
20
21=== modified file 'templates/ci/job.html'
22--- templates/ci/job.html 2013-09-19 21:56:00 +0000
23+++ templates/ci/job.html 2013-10-11 02:50:07 +0000
24@@ -1,5 +1,4 @@
25 {% extends "layout.html" %}
26-{% load url from future %}
27 {% load dashboard_extras %}
28
29 {% block page_name %}Upstream merger builds for {{ job.name }}{% endblock %}
30
31=== modified file 'templates/ci/project_detail.html'
32--- templates/ci/project_detail.html 2013-09-19 21:56:00 +0000
33+++ templates/ci/project_detail.html 2013-10-11 02:50:07 +0000
34@@ -1,5 +1,4 @@
35 {% extends "layout.html" %}
36-{% load url from future %}
37 {% load dashboard_extras staticfiles percentage %}
38 {% block extra_headers %}
39 <link type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/nvd3/0.9/nv.d3.css" rel="stylesheet" />
40
41=== modified file 'templates/ci/project_list.html'
42--- templates/ci/project_list.html 2013-09-19 21:56:00 +0000
43+++ templates/ci/project_list.html 2013-10-11 02:50:07 +0000
44@@ -1,5 +1,4 @@
45 {% extends "ci/ci_layout.html" %}
46-{% load url from future %}
47 {% load dashboard_extras percentage staticfiles %}
48
49 {% block page_name %}Upstream merger results for all projects{% endblock %}
50
51=== modified file 'templates/ci/stack_list.html'
52--- templates/ci/stack_list.html 2013-09-19 21:56:00 +0000
53+++ templates/ci/stack_list.html 2013-10-11 02:50:07 +0000
54@@ -1,5 +1,4 @@
55 {% extends "ci/ci_layout.html" %}
56-{% load url from future %}
57 {% load dashboard_extras ci_extras %}
58
59 {% block page_name %}CI{% endblock %}

Subscribers

People subscribed via source and target branches

to all changes: