Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
74912bc5
Commit
74912bc5
authored
Oct 07, 2016
by
Nimisha Asthagiri
Committed by
GitHub
Oct 07, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #13693 from edx/common_cleanup/geoinfo
Move geoinfo from common to openedx/core
parents
12ec1fff
579145f0
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
3 additions
and
2 deletions
+3
-2
lms/envs/common.py
+1
-1
openedx/core/djangoapps/geoinfo/__init__.py
+0
-0
openedx/core/djangoapps/geoinfo/middleware.py
+0
-0
openedx/core/djangoapps/geoinfo/tests/__init__.py
+0
-0
openedx/core/djangoapps/geoinfo/tests/test_middleware.py
+2
-1
No files found.
lms/envs/common.py
View file @
74912bc5
...
@@ -1122,7 +1122,7 @@ MIDDLEWARE_CLASSES = (
...
@@ -1122,7 +1122,7 @@ MIDDLEWARE_CLASSES = (
'splash.middleware.SplashMiddleware'
,
'splash.middleware.SplashMiddleware'
,
'geoinfo.middleware.CountryMiddleware'
,
'
openedx.core.djangoapps.
geoinfo.middleware.CountryMiddleware'
,
'embargo.middleware.EmbargoMiddleware'
,
'embargo.middleware.EmbargoMiddleware'
,
# Allows us to set user preferences
# Allows us to set user preferences
...
...
common
/djangoapps/geoinfo/__init__.py
→
openedx/core
/djangoapps/geoinfo/__init__.py
View file @
74912bc5
File moved
common
/djangoapps/geoinfo/middleware.py
→
openedx/core
/djangoapps/geoinfo/middleware.py
View file @
74912bc5
File moved
common
/djangoapps/geoinfo/tests/__init__.py
→
openedx/core
/djangoapps/geoinfo/tests/__init__.py
View file @
74912bc5
File moved
common
/djangoapps/geoinfo/tests/test_middleware.py
→
openedx/core
/djangoapps/geoinfo/tests/test_middleware.py
View file @
74912bc5
# pylint: disable=no-member
"""
"""
Tests for CountryMiddleware.
Tests for CountryMiddleware.
"""
"""
...
@@ -7,8 +8,8 @@ import pygeoip
...
@@ -7,8 +8,8 @@ import pygeoip
from
django.contrib.sessions.middleware
import
SessionMiddleware
from
django.contrib.sessions.middleware
import
SessionMiddleware
from
django.test
import
TestCase
from
django.test
import
TestCase
from
django.test.client
import
RequestFactory
from
django.test.client
import
RequestFactory
from
geoinfo.middleware
import
CountryMiddleware
from
openedx.core.djangoapps.geoinfo.middleware
import
CountryMiddleware
from
student.tests.factories
import
UserFactory
,
AnonymousUserFactory
from
student.tests.factories
import
UserFactory
,
AnonymousUserFactory
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment