Fix a few Gargoyle issues, switch to using our own forked branch

This commit is contained in:
2011-08-26 13:03:52 +01:00
parent 98832f8782
commit 6d8f491326
2 changed files with 18 additions and 1 deletions

View File

@@ -28,6 +28,7 @@ TEMPLATE_LOADERS = (
MIDDLEWARE_CLASSES = ( MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware', 'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
'sso.middleware.InactiveLogoutMiddleware', 'sso.middleware.InactiveLogoutMiddleware',
@@ -107,3 +108,19 @@ CELERY_EAGER_PROPAGATES_EXCEPTIONS = DEBUG
# Load the Celery tasks # Load the Celery tasks
djcelery.setup_loader() djcelery.setup_loader()
GARGOYLE_AUTO_CREATE = True
# Switches for Gargoyle
GARGOYLE_SWITCH_DEFAULTS = {
'reddit': {
'is_active': True,
'label': 'Reddit Functionality',
'description': 'Enables/Disables the Reddit integration for HR and SSO.',
},
'hr': {
'is_active': True,
'label': 'HR Functions',
'description': 'Enables/Disables the HR functionality.',
},
}

View File

@@ -14,4 +14,4 @@ django-celery==2.2.4
xmpppy xmpppy
django-sentry django-sentry
nexus nexus
gargoyle -e git+https://nikdoof@github.com/nikdoof/gargoyle.git@dca57fc4b437b85f8cbc#egg=gargoyle