Merge lp:~cjohnston/summit/debug into lp:summit

Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: no longer in the source branch.
Merged at revision: 112
Proposed branch: lp:~cjohnston/summit/debug
Merge into: lp:summit
Diff against target: 22 lines (+2/-2)
2 files modified
summit/settings.py (+1/-1)
summit/templates/404.html (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/summit/debug
Reviewer Review Type Date Requested Status
Summit Hackers Pending
Review via email: mp+60591@code.launchpad.net
To post a comment you must log in.
lp:~cjohnston/summit/debug updated
110. By Michael Hall

Updated setup.py and requirements.txt to match current production environment

111. By Nigel Babu

Fixes to reschedule command

112. By Chris Johnston

Disable debug mode and give better error messages

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/settings.py'
2--- summit/settings.py 2011-05-03 13:34:22 +0000
3+++ summit/settings.py 2011-05-11 08:42:38 +0000
4@@ -20,7 +20,7 @@
5
6 THIS_DIR = os.path.dirname(__file__)
7
8-DEBUG = True
9+DEBUG = False
10 TEMPLATE_DEBUG = DEBUG
11
12 ADMINS = (
13
14=== modified file 'summit/templates/404.html'
15--- summit/templates/404.html 2010-04-08 17:34:08 +0000
16+++ summit/templates/404.html 2011-05-11 08:42:38 +0000
17@@ -1,4 +1,4 @@
18 {% extends "base.html" %}
19 {% block content %}
20-<p> This page does not exist </p>
21+<p>{% trans "This page does not exist." %} {% trans 'If you feel that this is an error, please' %} <a href="https://bugs.launchpad.net/summit/+filebug">{% trans 'file a bug' %}</a></p>
22 {% endblock %}

Subscribers

People subscribed via source and target branches