Ubuntu CI Dashboard

Merge lp:~cjohnston/qa-dashboard/remove-future-urls into lp:qa-dashboard

  1. remove-future-urls
  2. Merge into dev
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 633
Merged at revision: 635
Proposed branch: lp:~cjohnston/qa-dashboard/remove-future-urls
Merge into: lp:qa-dashboard
Diff against target: 324 lines (+0/-33)
32 files modified
bootspeed/templates/bootspeed/arch_overview.html (+0/-1)
bootspeed/templates/bootspeed/bootspeed_layout.html (+0/-1)
bootspeed/templates/bootspeed/bug_detail.html (+0/-1)
bootspeed/templates/bootspeed/bug_overview.html (+0/-1)
bootspeed/templates/bootspeed/image_bugs_detail.html (+0/-1)
bootspeed/templates/bootspeed/image_bugs_overview.html (+0/-1)
bootspeed/templates/bootspeed/kpi_simple_average.html (+0/-1)
bootspeed/templates/bootspeed/machine_data.html (+0/-1)
bootspeed/templates/bootspeed/nav.html (+0/-1)
bootspeed/templates/bootspeed/overview.html (+0/-1)
common/templates/404.html (+0/-1)
common/templates/layout.html (+0/-1)
eventstat/templates/eventstat/arch_overview.html (+0/-1)
eventstat/templates/eventstat/kpi_simple_average.html (+0/-1)
eventstat/templates/eventstat/task_overview.html (+0/-1)
idle_power/templates/idle_power/arch_overview.html (+0/-1)
memevent/tables.py (+0/-2)
memevent/templates/memevent/arch_overview.html (+0/-1)
memevent/templates/memevent/event_chart.html (+0/-1)
memevent/templates/memevent/image_chart.html (+0/-1)
memevent/templates/memevent/image_overview.html (+0/-1)
memory/templates/memory/arch_overview.html (+0/-1)
memory/templates/memory/memory_layout.html (+0/-1)
memory/templates/memory/process_overview.html (+0/-1)
power/templates/power/arch_overview.html (+0/-1)
power/templates/power/overview.html (+0/-1)
power/templates/power/power_layout.html (+0/-1)
smokeng/templates/smokeng/kpi_pass_rate.html (+0/-1)
smokeng/templates/smokeng/kpi_simple_pass_rate.html (+0/-1)
smokeng/templates/smokeng/kpi_variant_pass_rate.html (+0/-1)
smokeng/templates/smokeng/overview.html (+0/-1)
sru/templates/sru/overview.html (+0/-1)
To merge this branch: bzr merge lp:~cjohnston/qa-dashboard/remove-future-urls
Reviewer Review Type Date Requested Status
Andy Doan (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+190520@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:633
http://10.97.0.26:8080/job/dashboard-ci/196/
Executed test runs:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/dashboard-ci/196/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andy Doan (doanac) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bootspeed/templates/bootspeed/arch_overview.html'
2--- bootspeed/templates/bootspeed/arch_overview.html 2013-08-20 02:17:03 +0000
3+++ bootspeed/templates/bootspeed/arch_overview.html 2013-10-11 02:52:27 +0000
4@@ -1,5 +1,4 @@
5 {% extends "bootspeed/bootspeed_layout.html" %}
6-{% load url from future %}
7 {% load dashboard_extras staticfiles %}
8
9 {% block page_name %}Bootspeed for {{ arch }}{% endblock %}
10
11=== modified file 'bootspeed/templates/bootspeed/bootspeed_layout.html'
12--- bootspeed/templates/bootspeed/bootspeed_layout.html 2013-08-20 02:17:03 +0000
13+++ bootspeed/templates/bootspeed/bootspeed_layout.html 2013-10-11 02:52:27 +0000
14@@ -1,5 +1,4 @@
15 {% extends "layout.html" %}
16-{% load url from future %}
17 {% block sub_nav_links %}
18 <li {% ifequal url.1 'job-bugs' %}class="active"{% endifequal %}><a class="sub-nav-item" href="{% url "bootspeed_image_bugs_overview" %}">Bootspeed Job Bugs</a></li>
19 {% endblock %}
20
21=== modified file 'bootspeed/templates/bootspeed/bug_detail.html'
22--- bootspeed/templates/bootspeed/bug_detail.html 2013-08-20 02:17:03 +0000
23+++ bootspeed/templates/bootspeed/bug_detail.html 2013-10-11 02:52:27 +0000
24@@ -1,5 +1,4 @@
25 {% extends "bootspeed/bootspeed_layout.html" %}
26-{% load url from future %}
27 {% load dashboard_extras %}
28
29 {% block page_name %}Bootspeed Jenkins Bug Detail{% endblock %}
30
31=== modified file 'bootspeed/templates/bootspeed/bug_overview.html'
32--- bootspeed/templates/bootspeed/bug_overview.html 2013-08-20 02:17:03 +0000
33+++ bootspeed/templates/bootspeed/bug_overview.html 2013-10-11 02:52:27 +0000
34@@ -1,5 +1,4 @@
35 {% extends "bootspeed/bootspeed_layout.html" %}
36-{% load url from future %}
37 {% load dashboard_extras %}
38
39 {% block page_name %}Bootspeed Jenkins Bugs{% endblock %}
40
41=== modified file 'bootspeed/templates/bootspeed/image_bugs_detail.html'
42--- bootspeed/templates/bootspeed/image_bugs_detail.html 2013-08-20 02:17:03 +0000
43+++ bootspeed/templates/bootspeed/image_bugs_detail.html 2013-10-11 02:52:27 +0000
44@@ -1,5 +1,4 @@
45 {% extends "bootspeed/bootspeed_layout.html" %}
46-{% load url from future %}
47 {% load dashboard_extras %}
48
49 {% block page_name %}Bootspeed Jenkins Builds{% endblock %}
50
51=== modified file 'bootspeed/templates/bootspeed/image_bugs_overview.html'
52--- bootspeed/templates/bootspeed/image_bugs_overview.html 2013-08-20 02:17:03 +0000
53+++ bootspeed/templates/bootspeed/image_bugs_overview.html 2013-10-11 02:52:27 +0000
54@@ -1,5 +1,4 @@
55 {% extends "bootspeed/bootspeed_layout.html" %}
56-{% load url from future %}
57 {% load dashboard_extras %}
58
59 {% block page_name %}Bootspeed Jenkins Images{% endblock %}
60
61=== modified file 'bootspeed/templates/bootspeed/kpi_simple_average.html'
62--- bootspeed/templates/bootspeed/kpi_simple_average.html 2013-09-03 22:10:49 +0000
63+++ bootspeed/templates/bootspeed/kpi_simple_average.html 2013-10-11 02:52:27 +0000
64@@ -1,5 +1,4 @@
65 {% load dashboard_extras %}
66-{% load url from future %}
67 {% if build_number %}
68 <strong>Build:</strong> {{ build_number }}
69 {% endif %}
70
71=== modified file 'bootspeed/templates/bootspeed/machine_data.html'
72--- bootspeed/templates/bootspeed/machine_data.html 2013-08-20 02:17:03 +0000
73+++ bootspeed/templates/bootspeed/machine_data.html 2013-10-11 02:52:27 +0000
74@@ -1,5 +1,4 @@
75 {% extends "bootspeed/bootspeed_layout.html" %}
76-{% load url from future %}
77 {% load dashboard_extras staticfiles %}
78
79 {% block page_name %}{{ name }} - {{ arch }} bootspeed{% endblock %}
80
81=== modified file 'bootspeed/templates/bootspeed/nav.html'
82--- bootspeed/templates/bootspeed/nav.html 2013-08-20 02:17:03 +0000
83+++ bootspeed/templates/bootspeed/nav.html 2013-10-11 02:52:27 +0000
84@@ -1,4 +1,3 @@
85-{% load url from future %}
86 <div class='grid_2'>
87 <h3 class='nav-title'>
88 ARCHITECTURE
89
90=== modified file 'bootspeed/templates/bootspeed/overview.html'
91--- bootspeed/templates/bootspeed/overview.html 2013-08-20 02:17:03 +0000
92+++ bootspeed/templates/bootspeed/overview.html 2013-10-11 02:52:27 +0000
93@@ -1,5 +1,4 @@
94 {% extends "bootspeed/bootspeed_layout.html" %}
95-{% load url from future %}
96 {% load dashboard_extras %}
97 {% block page_name %}Bootspeed{% endblock %}
98
99
100=== modified file 'common/templates/404.html'
101--- common/templates/404.html 2013-09-04 15:35:09 +0000
102+++ common/templates/404.html 2013-10-11 02:52:27 +0000
103@@ -1,5 +1,4 @@
104 {% extends 'layout.html' %}
105-{% load url from future %}
106
107 {% block page_name %}This page does not exist{% endblock %}
108
109
110=== modified file 'common/templates/layout.html'
111--- common/templates/layout.html 2013-09-27 17:49:22 +0000
112+++ common/templates/layout.html 2013-10-11 02:52:27 +0000
113@@ -1,5 +1,4 @@
114 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
115-{% load url from future %}
116 {% load staticfiles %}
117 {% load instance %}
118 {% load analytics %}
119
120=== modified file 'eventstat/templates/eventstat/arch_overview.html'
121--- eventstat/templates/eventstat/arch_overview.html 2013-08-20 02:17:03 +0000
122+++ eventstat/templates/eventstat/arch_overview.html 2013-10-11 02:52:27 +0000
123@@ -1,5 +1,4 @@
124 {% extends "power/power_layout.html" %}
125-{% load url from future %}
126 {% load dashboard_extras staticfiles %}
127
128 {% block page_name %}Wakeups for {{ arch }}{% endblock %}
129
130=== modified file 'eventstat/templates/eventstat/kpi_simple_average.html'
131--- eventstat/templates/eventstat/kpi_simple_average.html 2013-09-03 22:10:49 +0000
132+++ eventstat/templates/eventstat/kpi_simple_average.html 2013-10-11 02:52:27 +0000
133@@ -1,4 +1,3 @@
134-{% load url from future %}
135 {% load dashboard_extras %}
136 {% if build_number %}
137 <strong>Build:</strong> {{ build_number }}
138
139=== modified file 'eventstat/templates/eventstat/task_overview.html'
140--- eventstat/templates/eventstat/task_overview.html 2013-08-20 02:17:03 +0000
141+++ eventstat/templates/eventstat/task_overview.html 2013-10-11 02:52:27 +0000
142@@ -1,5 +1,4 @@
143 {% extends "power/power_layout.html" %}
144-{% load url from future %}
145 {% load dashboard_extras staticfiles %}
146
147 {% block page_name %}{{ task.task }} on {{ machine.name|display_name }}{% endblock %}
148
149=== modified file 'idle_power/templates/idle_power/arch_overview.html'
150--- idle_power/templates/idle_power/arch_overview.html 2013-08-20 02:17:03 +0000
151+++ idle_power/templates/idle_power/arch_overview.html 2013-10-11 02:52:27 +0000
152@@ -1,5 +1,4 @@
153 {% extends "power/power_layout.html" %}
154-{% load url from future %}
155 {% load dashboard_extras staticfiles %}
156
157 {% block page_name %}Idle Power consumption for {{ arch }}{% endblock %}
158
159=== modified file 'memevent/tables.py'
160--- memevent/tables.py 2013-10-07 15:40:01 +0000
161+++ memevent/tables.py 2013-10-11 02:52:27 +0000
162@@ -144,7 +144,6 @@
163 order_by = ('variant', '-build_number')
164
165 build_number = tables.TemplateColumn(
166- '{% load url from future %}'
167 '<a href='
168 '"{% url "memevent_image_overview" record.id record.machine %}">'
169 '{{ record.build_number }}</a>',
170@@ -190,7 +189,6 @@
171 attrs={'td': {'class': 'num'}},
172 )
173 event = tables.TemplateColumn(
174- '{% load url from future %}'
175 '<a href="{% url "memevent_event_detail" record.id record.machine '
176 'record.event %}">'
177 '{{ record.event }}</a>'
178
179=== modified file 'memevent/templates/memevent/arch_overview.html'
180--- memevent/templates/memevent/arch_overview.html 2013-08-20 02:17:03 +0000
181+++ memevent/templates/memevent/arch_overview.html 2013-10-11 02:52:27 +0000
182@@ -1,5 +1,4 @@
183 {% extends "memory/memory_layout.html" %}
184-{% load url from future %}
185 {% load render_table from django_tables2 %}
186
187 {% block page_name %}Memory Event images for {{ arch }}{% endblock %}
188
189=== modified file 'memevent/templates/memevent/event_chart.html'
190--- memevent/templates/memevent/event_chart.html 2013-09-03 22:10:49 +0000
191+++ memevent/templates/memevent/event_chart.html 2013-10-11 02:52:27 +0000
192@@ -1,5 +1,4 @@
193 {% include "nvd3_include.html" %}
194-{% load url from future %}
195 {% load staticfiles %}
196 <link rel="stylesheet" type="text/css" href="{% static 'css/lineChart.css' %}">
197 <script>
198
199=== modified file 'memevent/templates/memevent/image_chart.html'
200--- memevent/templates/memevent/image_chart.html 2013-08-20 02:17:03 +0000
201+++ memevent/templates/memevent/image_chart.html 2013-10-11 02:52:27 +0000
202@@ -1,5 +1,4 @@
203 {% include "nvd3_include.html" %}
204-{% load url from future %}
205 <script>
206 var api_url = '{% url "memevent_api_detail_overview" image.id machine %}';
207 d3.json(api_url, function(data) {
208
209=== modified file 'memevent/templates/memevent/image_overview.html'
210--- memevent/templates/memevent/image_overview.html 2013-08-20 02:17:03 +0000
211+++ memevent/templates/memevent/image_overview.html 2013-10-11 02:52:27 +0000
212@@ -1,5 +1,4 @@
213 {% extends "memory/memory_layout.html" %}
214-{% load url from future %}
215 {% load render_table from django_tables2 %}
216
217 {% block page_name %}Memory Event details for {{ image }}{% endblock %}
218
219=== modified file 'memory/templates/memory/arch_overview.html'
220--- memory/templates/memory/arch_overview.html 2013-08-20 02:17:03 +0000
221+++ memory/templates/memory/arch_overview.html 2013-10-11 02:52:27 +0000
222@@ -1,5 +1,4 @@
223 {% extends "memory/memory_layout.html" %}
224-{% load url from future %}
225 {% load dashboard_extras staticfiles %}
226
227 {% block page_name %}Memory consumption for {{ arch }}{% endblock %}
228
229=== modified file 'memory/templates/memory/memory_layout.html'
230--- memory/templates/memory/memory_layout.html 2013-08-20 02:17:03 +0000
231+++ memory/templates/memory/memory_layout.html 2013-10-11 02:52:27 +0000
232@@ -1,5 +1,4 @@
233 {% extends "layout.html" %}
234-{% load url from future %}
235 {% block sub_nav_links %}
236 <li {% ifequal url.1 'idle' %}class="active"{% endifequal %}><a class="sub-nav-item" href="{% url "memory_arch_overview" %}">Idle</a></li>
237 <li {% ifequal url.1 'memevent' %}class="active"{% endifequal %}><a class="sub-nav-item" href="{% url "memevent_arch_overview" %}">Events</a></li>
238
239=== modified file 'memory/templates/memory/process_overview.html'
240--- memory/templates/memory/process_overview.html 2013-08-20 02:17:03 +0000
241+++ memory/templates/memory/process_overview.html 2013-10-11 02:52:27 +0000
242@@ -1,5 +1,4 @@
243 {% extends "memory/memory_layout.html" %}
244-{% load url from future %}
245 {% load dashboard_extras staticfiles %}
246
247 {% block page_name %}Per-process memory consumption for {{ arch }} on {{ machine }}{% endblock %}
248
249=== modified file 'power/templates/power/arch_overview.html'
250--- power/templates/power/arch_overview.html 2013-08-20 02:17:03 +0000
251+++ power/templates/power/arch_overview.html 2013-10-11 02:52:27 +0000
252@@ -1,5 +1,4 @@
253 {% extends "power/power_layout.html" %}
254-{% load url from future %}
255 {% load dashboard_extras staticfiles %}
256
257 {% block page_name %}Power consumption for {{ arch }}{% endblock %}
258
259=== modified file 'power/templates/power/overview.html'
260--- power/templates/power/overview.html 2013-08-20 02:17:03 +0000
261+++ power/templates/power/overview.html 2013-10-11 02:52:27 +0000
262@@ -1,5 +1,4 @@
263 {% extends "power/power_layout.html" %}
264-{% load url from future %}
265 {% load dashboard_extras %}
266
267 {% block page_name %}Power Consumption{% endblock %}
268
269=== modified file 'power/templates/power/power_layout.html'
270--- power/templates/power/power_layout.html 2013-08-20 02:17:03 +0000
271+++ power/templates/power/power_layout.html 2013-10-11 02:52:27 +0000
272@@ -1,5 +1,4 @@
273 {% extends "layout.html" %}
274-{% load url from future %}
275 {% block sub_nav_links %}
276 <li {% ifequal url.1 'hardware' %}class="active"{% endifequal %}><a class="sub-nav-item" href="{% url "power_arch_overview" 'amd64' %}">Hardware Measurement</a></li>
277 <li {% ifequal url.1 'idle' %}class="active"{% endifequal %}><a class="sub-nav-item" href="{% url "idle_power_arch" %}">Software Measurement</a></li>
278
279=== modified file 'smokeng/templates/smokeng/kpi_pass_rate.html'
280--- smokeng/templates/smokeng/kpi_pass_rate.html 2013-08-20 02:17:03 +0000
281+++ smokeng/templates/smokeng/kpi_pass_rate.html 2013-10-11 02:52:27 +0000
282@@ -1,4 +1,3 @@
283-{% load url from future %}
284 {% load render_table from django_tables2 %}
285 {% for entry in tables %}
286 <div class="kpi_item {% cycle 'col1' 'col2' 'col3' 'col4' 'col_last'%}">
287
288=== modified file 'smokeng/templates/smokeng/kpi_simple_pass_rate.html'
289--- smokeng/templates/smokeng/kpi_simple_pass_rate.html 2013-08-20 02:17:03 +0000
290+++ smokeng/templates/smokeng/kpi_simple_pass_rate.html 2013-10-11 02:52:27 +0000
291@@ -1,4 +1,3 @@
292-{% load url from future %}
293 {% load dashboard_extras %}
294 {% if build_number %}
295 <strong>Build:</strong> {{ build_number}}
296
297=== modified file 'smokeng/templates/smokeng/kpi_variant_pass_rate.html'
298--- smokeng/templates/smokeng/kpi_variant_pass_rate.html 2013-09-10 14:14:53 +0000
299+++ smokeng/templates/smokeng/kpi_variant_pass_rate.html 2013-10-11 02:52:27 +0000
300@@ -1,4 +1,3 @@
301-{% load url from future %}
302 {% load dashboard_extras %}
303 {% if help_info %}
304 <a class="css-tooltip no-border" href="#"><div class="help kpihelp">?</div><span class="classic">
305
306=== modified file 'smokeng/templates/smokeng/overview.html'
307--- smokeng/templates/smokeng/overview.html 2013-09-03 22:10:49 +0000
308+++ smokeng/templates/smokeng/overview.html 2013-10-11 02:52:27 +0000
309@@ -1,6 +1,5 @@
310 {% extends "smokeng/smoke_layout.html" %}
311 {% load dashboard_extras staticfiles %}
312-{% load url from future %}
313 {% load render_table from django_tables2 %}
314
315 {% block page_name %}
316
317=== modified file 'sru/templates/sru/overview.html'
318--- sru/templates/sru/overview.html 2013-08-20 02:17:03 +0000
319+++ sru/templates/sru/overview.html 2013-10-11 02:52:27 +0000
320@@ -1,5 +1,4 @@
321 {% extends "sru/sru_layout.html" %}
322-{% load url from future %}
323 {% load dashboard_extras %}
324 {% load render_table from django_tables2 %}
325

Subscribers

People subscribed via source and target branches