Merge branch 'new_lms_dev(critical)' into 'new_lms_dev'

fix See merge request skillbox/go.skillbox.ru!82
8 years ago · ede34d9290
parent 535f822b64 ee519ac50f
commit ede34d9290
2 changed files with 2 additions and 2 deletions
--- a/finance/migrations/0001_initial.py
+++ b/finance/migrations/0001_initial.py
@ -12,7 +12,7 @@ class Migration(migrations.Migration):
    initial = True

    dependencies = [
-        ('yandex_money', '0002_auto_20171128_1150'),
+        ('yandex_money', '0001_initial'),
        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
    ]

--- a/lms/settings.py
+++ b/lms/settings.py
@ -128,7 +128,7 @@ MIDDLEWARE_CLASSES = [
    'django.middleware.clickjacking.XFrameOptionsMiddleware',
    #'access.middleware.CheckPerm',
    'access.middleware.RequestToApi',
-    'access.middleware.UpdateActivity',
+    # 'access.middleware.UpdateActivity',
 ]

 ROOT_URLCONF = 'lms.urls'