Fix merge conflicts relative to master

cms/djangoapps/contentstore/views/public.py

@@ -44,15 +44,11 @@ def login_page(request):
         # SSL login doesn't require a login view, so redirect
         # to course now that the user is authenticated via
         # the decorator.
-<<<<<<< HEAD
-        return redirect('/course/')
-=======
         next_url = request.GET.get('next')
         if next_url:
             return redirect(next_url)
         else:
-            return redirect('/course')
->>>>>>> edx/master
+            return redirect('/course/')
     if settings.FEATURES.get('AUTH_USE_CAS'):
         # If CAS is enabled, redirect auth handling to there
         return redirect(reverse('cas-login'))

common/djangoapps/external_auth/tests/test_ssl.py

@@ -16,22 +16,19 @@ from django.test.client import RequestFactory
 from django.test.utils import override_settings
 from mock import Mock
 
+import external_auth.views
 from edxmako.middleware import MakoMiddleware
 from external_auth.models import ExternalAuthMap
-import external_auth.views
-from student.roles import CourseStaffRole
-from student.tests.factories import UserFactory
-<<<<<<< HEAD
 from opaque_keys import InvalidKeyError
-=======
 from student.models import CourseEnrollment
+from student.roles import CourseStaffRole
+from student.tests.factories import UserFactory
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import loc_mapper
 from xmodule.modulestore.exceptions import InsufficientSpecificationError
 from xmodule.modulestore.tests.django_utils import (ModuleStoreTestCase,
                                                     mixed_store_config)
 from xmodule.modulestore.tests.factories import CourseFactory
->>>>>>> edx/master
 
 FEATURES_WITH_SSL_AUTH = settings.FEATURES.copy()
 FEATURES_WITH_SSL_AUTH['AUTH_USE_CERTIFICATES'] = True

common/djangoapps/student/views.py

@@ -1856,7 +1856,6 @@ def change_email_settings(request):
         track.views.server_track(request, "change-email-settings", {"receive_emails": "no", "course": course_id}, page='dashboard')
 
     return JsonResponse({"success": True})
-<<<<<<< HEAD
 
 
 @login_required
@@ -1880,5 +1879,3 @@ def token(request):
     newtoken = create_token(secret, custom_data)
     response = HttpResponse(newtoken, mimetype="text/plain")
     return response
-=======
->>>>>>> edx/master

lms/djangoapps/dashboard/sysadmin.py

@@ -488,17 +488,9 @@ class Courses(SysadminDashboardView):
 
         data = []
 
-<<<<<<< HEAD
         for course in self.get_courses():
-            gdir = course.id.run
+            gdir = course.id.course
             data.append([course.display_name, course.id.to_deprecated_string()]
-=======
-        for (cdir, course) in courses.items():
-            gdir = cdir
-            if '/' in cdir:
-                gdir = cdir.split('/')[1]
-            data.append([course.display_name, cdir]
->>>>>>> edx/master
                         + self.git_info_for_course(gdir))
 
         return dict(header=[_('Course Name'), _('Directory/ID'),
@@ -580,14 +572,8 @@ class Courses(SysadminDashboardView):
                 delete_course(self.def_ms, content_store, course.id, commit)
                 # don't delete user permission groups, though
                 self.msg += \
-<<<<<<< HEAD
-                    u"<font color='red'>{0} {1} ({2})</font>".format(
-                        _('Deleted'), course.id.to_deprecated_string(), course.display_name)
-            datatable = self.make_datatable()
-=======
                     u"<font color='red'>{0} {1} = {2} ({3})</font>".format(
-                        _('Deleted'), loc, course.id, course.display_name)
->>>>>>> edx/master
+                        _('Deleted'), loc, course.id.to_deprecated_string(), course.display_name)
 
         context = {
             'datatable': self.make_datatable(),