Merge remote-tracking branch 'origin/release' into merge-release-into-master

Conflicts:
	common/djangoapps/student/views.py
	openedx/core/djangoapps/credit/tests/test_api.py

common/djangoapps/student/tests/test_credit.py

@@ -4,6 +4,7 @@ Tests for credit courses on the student dashboard.
 import unittest
 import datetime
 
+from mock import patch
 import pytz
 
 from django.conf import settings
@@ -26,6 +27,7 @@ TEST_CREDIT_PROVIDER_SECRET_KEY = "931433d583c84ca7ba41784bad3232e6"
 @override_settings(CREDIT_PROVIDER_SECRET_KEYS={
     "hogwarts": TEST_CREDIT_PROVIDER_SECRET_KEY,
 })
+@patch.dict(settings.FEATURES, {"ENABLE_CREDIT_ELIGIBILITY": True})
 class CreditCourseDashboardTest(ModuleStoreTestCase):
     """
     Tests for credit courses on the student dashboard.

common/djangoapps/student/views.py

@@ -803,6 +803,10 @@ def _credit_statuses(user, course_enrollment_pairs):
     """
     from openedx.core.djangoapps.credit import api as credit_api
 
+    # Feature flag off
+    if not settings.FEATURES.get("ENABLE_CREDIT_ELIGIBILITY"):
+        return {}
+
     request_status_by_course = {
         request["course_key"]: request["status"]
         for request in credit_api.get_credit_requests_for_user(user.username)

openedx/core/djangoapps/credit/tests/test_api.py

@@ -4,6 +4,7 @@ Tests for the API functions in the credit app.
 import datetime
 import ddt
 import pytz
+
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.db import connection, transaction