From patchwork Wed Jan 18 09:00:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 6278 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 3891223F83 for ; Wed, 18 Jan 2012 09:00:27 +0000 (UTC) Received: from mail-bk0-f52.google.com (mail-bk0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id 28524A18010 for ; Wed, 18 Jan 2012 09:00:27 +0000 (UTC) Received: by mail-bk0-f52.google.com with SMTP id zt4so2747865bkb.11 for ; Wed, 18 Jan 2012 01:00:27 -0800 (PST) Received: by 10.204.153.27 with SMTP id i27mr8282727bkw.81.1326877226977; Wed, 18 Jan 2012 01:00:26 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.82.144 with SMTP id ac16cs141116bkc; Wed, 18 Jan 2012 01:00:26 -0800 (PST) Received: by 10.180.24.105 with SMTP id t9mr34809895wif.19.1326877225404; Wed, 18 Jan 2012 01:00:25 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id y18si15224831weq.36.2012.01.18.01.00.25 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 18 Jan 2012 01:00:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1RnRNW-0001rv-6D for ; Wed, 18 Jan 2012 09:00:22 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 20B7AE06D0 for ; Wed, 18 Jan 2012 09:00:22 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-server X-Launchpad-Branch: ~linaro-validation/lava-server/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 339 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-server/trunk] Rev 339: Merge lp:~zkrynicki/lava-server/fix-915293 Message-Id: <20120118090022.15578.58210.launchpad@ackee.canonical.com> Date: Wed, 18 Jan 2012 09:00:22 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14681"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 246dc0b3b660494d429ec7c737eb279ead05defa Merge authors: Zygmunt Krynicki (zkrynicki) Related merge proposals: https://code.launchpad.net/~zkrynicki/lava-server/fix-915293/+merge/88364 proposed by: Zygmunt Krynicki (zkrynicki) ------------------------------------------------------------ revno: 339 [merge] committer: Zygmunt Krynicki branch nick: trunk timestamp: Wed 2012-01-18 09:56:04 +0100 message: Merge lp:~zkrynicki/lava-server/fix-915293 modified: lava_server/settings/common.py --- lp:lava-server https://code.launchpad.net/~linaro-validation/lava-server/trunk You are subscribed to branch lp:lava-server. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-server/trunk/+edit-subscription === modified file 'lava_server/settings/common.py' --- lava_server/settings/common.py 2011-12-15 09:30:10 +0000 +++ lava_server/settings/common.py 2012-01-12 12:39:35 +0000 @@ -90,12 +90,12 @@ ADMIN_MEDIA_PREFIX = MOUNT_POINT + "static/admin/" # The true outer url is /lava-server/ -LOGIN_REDIRECT_URL = MOUNT_POINT + "" +LOGIN_REDIRECT_URL = MOUNT_POINT + "/" # URL of the login screen, has to be hard-coded like that for Django. # I cheat a little, using DATA_URL_PREFIX here is technically incorrect # but it seems better than hard-coding 'lava-server' yet again. -LOGIN_URL = MOUNT_POINT + "accounts/login/" +LOGIN_URL = MOUNT_POINT + "/accounts/login/" INSTALLED_APPS = [ 'django.contrib.auth',