From a17a6a21c0d01d571c31fa6175a9899e877c2a74 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulipchat.com>
Date: Tue, 27 Sep 2016 19:18:58 -0700
Subject: [PATCH] Upgrade Django to 1.8.15 with Zulip patches.

---
 requirements/common.txt               | 2 +-
 tools/travis/success-http-headers.txt | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/requirements/common.txt b/requirements/common.txt
index b5d266a8f6..732c9b5de3 100644
--- a/requirements/common.txt
+++ b/requirements/common.txt
@@ -1,6 +1,6 @@
 -r ipython.txt
 # Django itself; we use a slightly patched version
-git+https://github.com/zulip/truncated-django.git#egg=Django==1.8
+git+https://github.com/zulip/truncated-django-1.8.15.git@cbf4fa3aef1b17f37d75a70e57f9b69a0f99ed5c#egg=Django==1.8.15
 
 # Needed for rendering backend templates
 Jinja2==2.8
diff --git a/tools/travis/success-http-headers.txt b/tools/travis/success-http-headers.txt
index b66fa6441f..384bd8d46b 100644
--- a/tools/travis/success-http-headers.txt
+++ b/tools/travis/success-http-headers.txt
@@ -24,7 +24,6 @@ Reusing existing connection to localhost:443.
   Content-Type: text/html; charset=utf-8
   Transfer-Encoding: chunked
   Connection: keep-alive
-  Cache-Control: max-age=0
   Strict-Transport-Security: max-age=15768000
 Length: unspecified [text/html]
 Saving to: ‘/tmp/index.html’