Merge pull request #12824 from edx/release

Release

common/djangoapps/student/admin.py

@@ -11,7 +11,7 @@ from xmodule.modulestore.django import modulestore
 from config_models.admin import ConfigurationModelAdmin
 from student.models import (
     UserProfile, UserTestGroup, CourseEnrollmentAllowed, DashboardConfiguration, CourseEnrollment, Registration,
-    PendingNameChange, CourseAccessRole, LinkedInAddToProfileConfiguration, UserAttribute
+    PendingNameChange, CourseAccessRole, LinkedInAddToProfileConfiguration, UserAttribute, LogoutViewConfiguration
 )
 from student.roles import REGISTERED_ACCESS_ROLES
 
@@ -183,6 +183,8 @@ admin.site.register(CourseEnrollmentAllowed)
 admin.site.register(Registration)
 admin.site.register(PendingNameChange)
 admin.site.register(DashboardConfiguration, ConfigurationModelAdmin)
+admin.site.register(LogoutViewConfiguration, ConfigurationModelAdmin)
+
 
 # We must first un-register the User model since it may also be registered by the auth app.
 admin.site.register(User, UserAdmin)

lms/static/sass/discussion/views/_thread.scss

@@ -134,10 +134,6 @@ body.discussion {
         border-radius: 3px;
       }
     }
-
-    img {
-      max-width: 100%;
-    }
   }
 
   .discussion-response .response-body {
@@ -207,3 +203,10 @@ body.view-in-course .discussion-article {
     }
   }
 }
+
+.thread-wrapper,
+.forum-new-post-form {
+  img {
+    max-width: 100%;
+  }
+}