Merge branch 'dev' into 'master'

Dev

See merge request !14

Envoy.blade.php

@@ -22,6 +22,7 @@ echo '{{ $new_release_dir }}'
 [ -d {{ $releases_dir }} ] || mkdir {{ $releases_dir }}
 @if ($branch)
     git clone -b {{ $branch }} {{ $repository }} {{ $new_release_dir }}
+    ln -nfs {{ $app_dir }}/configs/{{ $branch }}/{{ $branch }}.env {{ $new_release_dir }}/config_app/settings/{{ $branch }}.env
 @endif
 @endtask
 

config_app/settings/dev.env

@@ -1,5 +0,0 @@
-DEBUG=True
-SECRET_KEY='!eiquy7_+2#vn3z%zfp51$m-=tmvtcv*cj*@x$!v(_9btq0w=$'
-DATABASE_URL='psql://team:nu5Xefise@127.0.0.1:5432/new_lms'
-EMAIL_URL='smtp+tls://robo@skillbox.ru:nu5Xefise@smtp.gmail.com:587'
-CACHE_URL=rediscache://127.0.0.1:6379/1?client_class=django_redis.client.DefaultClient

lms/settings.py

@@ -122,11 +122,11 @@ MIDDLEWARE_CLASSES = [
     # 'access.middleware.UpdateActivity',
 ]
 
-REST_FRAMEWORK = {
+# REST_FRAMEWORK = {
-    'DEFAULT_AUTHENTICATION_CLASSES': (
+#     'DEFAULT_AUTHENTICATION_CLASSES': (
-        'rest_framework.authentication.SessionAuthentication'
+#         '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'
 }