From c9fb4c5972e074a48afc718ae637a5eff69c5a1b Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Mon, 3 Nov 2014 16:40:09 -0200
Subject: [PATCH] Removed old logout view

---
 colab/accounts/urls.py  | 2 --
 colab/accounts/views.py | 8 --------
 colab/settings.py       | 2 +-
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/colab/accounts/urls.py b/colab/accounts/urls.py
index bb026e3..cc6e9e5 100644
--- a/colab/accounts/urls.py
+++ b/colab/accounts/urls.py
@@ -12,8 +12,6 @@ urlpatterns = patterns('',
     url(r'^change-password/$',
         ChangeXMPPPasswordView.as_view(), name='change_password'),
 
-    url(r'^logout/?$', 'colab.accounts.views.logoutColab', name='logout'),
-
     url(r'^(?P<username>[\w@+.-]+)/?$',
         UserProfileDetailView.as_view(), name='user_profile'),
 
diff --git a/colab/accounts/views.py b/colab/accounts/views.py
index af3d1b5..8f592d7 100644
--- a/colab/accounts/views.py
+++ b/colab/accounts/views.py
@@ -5,7 +5,6 @@ import datetime
 
 from collections import OrderedDict
 
-from django.contrib.auth.views import logout
 from django.contrib import messages
 from django.db import transaction
 from django.db.models import Count
@@ -116,13 +115,6 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
         return super(UserProfileDetailView, self).get_context_data(**context)
 
 
-def logoutColab(request):
-       response = logout(request, next_page='/')
-       response.delete_cookie('_redmine_session')
-       response.delete_cookie('_gitlab_session')
-       return response
-
-
 def signup(request):
     # If the request method is GET just return the form
     if request.method == 'GET':
diff --git a/colab/settings.py b/colab/settings.py
index 9008c4d..848d8a0 100644
--- a/colab/settings.py
+++ b/colab/settings.py
@@ -260,7 +260,7 @@ BROWSERID_AUDIENCES = [SITE_URL, SITE_URL.replace('https', 'http')]
 LOGIN_URL = '/'
 LOGIN_REDIRECT_URL = '/'
 LOGIN_REDIRECT_URL_FAILURE = '/'
-LOGOUT_REDIRECT_URL = '/user/logout'
+LOGOUT_REDIRECT_URL = '/'
 BROWSERID_CREATE_USER = False
 
 REVPROXY_ADD_REMOTE_USER = True
--
libgit2 0.21.2