Merge branch 'chiaki_dev' into zemal_dev

* chiaki_dev:
  fix ci
  Add submission module

# Conflicts:
#	requirements.txt

oj/local_settings.py

@@ -24,6 +24,13 @@ CACHES = {
         "OPTIONS": {
             "CLIENT_CLASS": "django_redis.client.DefaultClient",
         }
+    },
+    "Throttling": {
+        "BACKEND": "django_redis.cache.RedisCache",
+        "LOCATION": "redis://127.0.0.1:6379/3",
+        "OPTIONS": {
+            "CLIENT_CLASS": "django_redis.client.DefaultClient",
+        }
     }
 }
 

oj/settings.py

@@ -45,6 +45,7 @@ INSTALLED_APPS = (
     'problem',
     'contest',
     'utils',
+    'submission',
 
     'rest_framework',
 )

oj/urls.py

@@ -10,5 +10,6 @@ urlpatterns = [
     url(r"^api/", include("problem.urls.oj")),
     url(r"^api/admin/", include("problem.urls.admin")),
     url(r"^api/admin/", include("contest.urls.admin")),
-    url(r"^api/", include("contest.urls.oj"))
+    url(r"^api/", include("contest.urls.oj")),
+    url(r"^api/", include("submission.urls.oj")),
 ]