summaryrefslogtreecommitdiff
path: root/example_project
diff options
context:
space:
mode:
Diffstat (limited to 'example_project')
-rw-r--r--example_project/local_settings.py.gitlab-ci1
-rw-r--r--example_project/settings.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/example_project/local_settings.py.gitlab-ci b/example_project/local_settings.py.gitlab-ci
index b4f94f6a1..b8f40b8bb 100644
--- a/example_project/local_settings.py.gitlab-ci
+++ b/example_project/local_settings.py.gitlab-ci
@@ -14,3 +14,4 @@ LOGFILE = '/tmp/ishtar.log'
PROJECT_SLUG = "CI-instance"
SECRET_KEY = "not-so-secret-key"
+DISABLE_TASK_TIMEOUT = True
diff --git a/example_project/settings.py b/example_project/settings.py
index f53176622..3ffea90b9 100644
--- a/example_project/settings.py
+++ b/example_project/settings.py
@@ -19,6 +19,7 @@ if "test" in sys.argv:
IMAGE_MAX_SIZE = (1280, 960) # put None if no resizing
THUMB_MAX_SIZE = (600, 600)
+DISABLE_TASK_TIMEOUT = False
CACHE_TASK_TIMEOUT = 4
CACHE_SMALLTIMEOUT = 60
CACHE_TIMEOUT = 3600