Merge branch 'current_branch' into 'dev'

migrate update

See merge request !13
feature/fix_generate_pass
Andrey 8 years ago
commit 3eec889e4a
  1. 12
      lms/settings.py

@ -122,11 +122,11 @@ MIDDLEWARE_CLASSES = [
# 'access.middleware.UpdateActivity',
]
REST_FRAMEWORK = {
'DEFAULT_AUTHENTICATION_CLASSES': (
'rest_framework.authentication.SessionAuthentication'
)
}
# REST_FRAMEWORK = {
# 'DEFAULT_AUTHENTICATION_CLASSES': (
# 'rest_framework.authentication.SessionAuthentication'
# )
# }
ROOT_URLCONF = 'lms.urls'
@ -180,5 +180,5 @@ STATIC_ROOT = os.path.join(BASE_DIR, 'static')
STATIC_URL = '/static/'
RAVEN_CONFIG = {
'dsn': 'http://caaea487274f4e23a9107862484c79f3:3d463ad4717942508536f7a659921950@sentry.skillbox.ru/3'
'dsn': 'http://1a09557dbd144e52af4b14bea569c114:fbb5dfaa39e64f02a1b4cc7ac665d7d7@sentry.skillbox.ru/7'
}

Loading…
Cancel
Save