Skip to content

Commit

Permalink
Merge branch 'develop' into release/1.5.3
Browse files Browse the repository at this point in the history
  • Loading branch information
courtneycb committed Nov 19, 2019
2 parents 06ca071 + e7d6d7b commit 2ebacc5
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 29 deletions.
5 changes: 0 additions & 5 deletions codewof/config/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
from django.contrib import admin
from django.contrib.auth.decorators import login_required
from django.views import defaults as default_views
from config.views import (
health_check,
)
admin.site.login = login_required(admin.site.login)
admin.site.site_header = 'CodeWOF'

Expand All @@ -19,8 +16,6 @@
path('users/', include('users.urls', namespace='users'),),
path('accounts/', include('allauth.urls')),
path('', include('programming.urls', namespace='programming'),),
path('gae/liveness_check', health_check),
path('gae/readiness_check', health_check),
path('ckeditor/', include('ckeditor_uploader.urls')),
] + static(
settings.MEDIA_URL, document_root=settings.MEDIA_ROOT
Expand Down
12 changes: 0 additions & 12 deletions codewof/config/views.py

This file was deleted.

6 changes: 0 additions & 6 deletions infrastructure/dev-deploy/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,5 @@ resources:
cpu: 1
memory_gb: 3.75

liveness_check:
path: "/gae/liveness_check"

readiness_check:
path: "/gae/readiness_check"

manual_scaling:
instances: 1
6 changes: 0 additions & 6 deletions infrastructure/prod-deploy/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,3 @@ env_variables:
resources:
cpu: 1
memory_gb: 3.75

liveness_check:
path: "/gae/liveness_check"

readiness_check:
path: "/gae/readiness_check"

0 comments on commit 2ebacc5

Please sign in to comment.