Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	requirements/edx/github.txt
This commit is contained in:
Adam Palay
2015-01-30 09:44:42 -05:00
parent 869b407e1f 13c36c9097
commit bfcfbfab2f
5 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/djangoapps/embargo/tests/test_middleware.py
View File

@@ -54,7 +54,7 @@ class EmbargoMiddlewareTests(ModuleStoreTestCase):
CourseEnrollment.enroll(self.user, self.regular_course.id)
CourseEnrollment.enroll(self.user, self.embargo_course.id)
# Text from lms/templates/static_templates/embargo.html
self.embargo_text = "Unfortunately, at this time edX must comply with export controls, and we cannot allow you to access this particular course."
self.embargo_text = "Unfortunately, at this time edX must comply with export controls, and we cannot allow you to access this course."
self.patcher = mock.patch.object(pygeoip.GeoIP, 'country_code_by_addr', self.mock_country_code_by_addr)
self.patcher.start()