Merge branch 'release/v18.6.5'

rowers/tasks.py

@@ -88,7 +88,10 @@ from django.conf import settings
 SITE_URL = CFG['site_url']
 SITE_URL_DEV = CFG['site_url']
 PROGRESS_CACHE_SECRET = CFG['progress_cache_secret']
-SETTINGS_NAME = CFG['settings_name']
+try:
+    SETTINGS_NAME = CFG['settings_name']
+except KeyError:
+    SETTINGS_NAME = 'rowsandall_ap.settings'
 
 try:
     UPLOAD_SERVICE_URL = CFG['upload_service_url']
@@ -1218,6 +1221,7 @@ def handle_calctrimp(id,
         workout = Workout.objects.get(id=id)
     except Workout.DoesNotExist:
         return 0
+
     workout.rscore = int(tss)
     workout.normp = int(normp)
     workout.trimp = int(trimp)