lp:~bigkevmcd/offspring/upgrade-to-django15

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:offspring at revision 184

Nicola Heald: Approve on 2014-01-15

Diff: 625 lines (+127/-127)

20 files modified

lib/offspring/web/queuemanager/management/commands/tests/test_build_metrics.py (+12/-23)
lib/offspring/web/queuemanager/models.py (+1/-1)
lib/offspring/web/queuemanager/tests/test_metrics.py (+2/-2)
lib/offspring/web/queuemanager/tests/test_views.py (+5/-4)
lib/offspring/web/queuemanager/views.py (+60/-43)
lib/offspring/web/settings_test.py (+5/-2)
lib/offspring/web/templates/queuemanager/build_details.html (+2/-2)
lib/offspring/web/templates/queuemanager/build_publish.html (+1/-1)
lib/offspring/web/templates/queuemanager/builders.html (+2/-2)
lib/offspring/web/templates/queuemanager/builds.html (+3/-3)
lib/offspring/web/templates/queuemanager/project_details.html (+4/-4)
lib/offspring/web/templates/queuemanager/project_edit.html (+1/-1)
lib/offspring/web/templates/queuemanager/projectgroup_details.html (+2/-2)
lib/offspring/web/templates/queuemanager/projects.html (+2/-2)
lib/offspring/web/templates/queuemanager/sidebars/build_farm.html (+2/-2)
lib/offspring/web/templates/queuemanager/sidebars/failed_builds.html (+1/-1)
lib/offspring/web/templates/queuemanager/sidebars/queued_builds.html (+1/-1)
lib/offspring/web/urls.py (+18/-28)
requirements/requirements.master.txt (+1/-1)
requirements/requirements.web.txt (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

190. By Kevin McDermott on 2014-01-10

Bump requirements.

189. By Kevin McDermott on 2014-01-10

All but piston errors fixed.

188. By Kevin McDermott on 2014-01-10

Views now all passing.

187. By Kevin McDermott on 2014-01-10

BuilderDetail view.

186. By Kevin McDermott on 2014-01-09

Builder list view now works.

185. By Kevin McDermott on 2014-01-09

More tests passing.

184. By Kevin McDermott on 2014-01-09

Start of migration to Django 1.5

183. By Kevin McDermott on 2013-10-28

Remove lpia from the list of architectures.

182. By Kevin McDermott on 2013-10-28

Validate the config_url for whitespace.

181. By Kevin McDermott on 2013-10-28

Fix the build result timestamp output on the builds page.