Skip to content
This repository has been archived by the owner on Oct 1, 2020. It is now read-only.

Commit

Permalink
migrate over to use static instead of staticfiles to make it work wit…
Browse files Browse the repository at this point in the history
…h heroku
  • Loading branch information
rns4731 committed Jul 8, 2015
1 parent e6dc8ed commit 82cfe1d
Show file tree
Hide file tree
Showing 1,828 changed files with 22 additions and 3 deletions.
19 changes: 19 additions & 0 deletions crowdsourcing/migrations/0012_auto_20150708_2216.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations


class Migration(migrations.Migration):

dependencies = [
('crowdsourcing', '0011_auto_20150708_1151'),
]

operations = [
migrations.AlterField(
model_name='task',
name='module',
field=models.ForeignKey(related_name='module_tasks', to='crowdsourcing.Module'),
),
]
6 changes: 3 additions & 3 deletions csp/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [os.path.join(BASE_DIR, 'staticfiles/templates')],
'DIRS': [os.path.join(BASE_DIR, 'static/templates')],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
Expand Down Expand Up @@ -135,7 +135,7 @@
STATIC_URL = '/static/'

STATICFILES_DIRS = (
os.path.join(BASE_DIR, 'staticfiles'),
os.path.join(BASE_DIR, 'static'),
)

# Honor the 'X-Forwarded-Proto' header for request.is_secure()
Expand All @@ -153,7 +153,7 @@
COMPRESS_ROOT = '/compress'
#Python 2
TEMPLATE_DIRS = (
os.path.join(BASE_DIR, 'staticfiles/templates'),
os.path.join(BASE_DIR, 'static/templates'),
)

# Email
Expand Down
Loading

0 comments on commit 82cfe1d

Please sign in to comment.