Merge branch 'master' into marlonkeating/upgrade-edx-enterprise-52f2231

cms/djangoapps/contentstore/tasks.py

@@ -1375,7 +1375,7 @@ def _filter_by_status(results):
             continue
         elif status == 403 and _is_studio_url(url):
             filtered_results.append([block_id, url, LinkState.LOCKED])
-        elif status in [403, None] and not _is_studio_url(url):
+        elif status in [403, 500, None] and not _is_studio_url(url):
             filtered_results.append([block_id, url, LinkState.EXTERNAL_FORBIDDEN])
         else:
             filtered_results.append([block_id, url, LinkState.BROKEN])

openedx/core/djangoapps/notifications/admin.py

@@ -82,6 +82,10 @@ class CourseNotificationPreferenceAdmin(admin.ModelAdmin):
     def get_username(self, obj):
         return obj.user.username
 
+    def get_queryset(self, request):
+        queryset = super().get_queryset(request)
+        return queryset.select_related("user").only("id", "user__username", "course_id")
+
     def get_search_results(self, request, queryset, search_term):
         """
         Custom search for CourseNotificationPreference model