diff --git a/conf/settings.py b/conf/settings.py index 4346245..634715a 100644 --- a/conf/settings.py +++ b/conf/settings.py @@ -87,6 +87,8 @@ DATABASES = { }, # Persistent connections "CONN_MAX_AGE": 0, + # Disable server-side cursors, might be needed with pgbouncer + "DISABLE_SERVER_SIDE_CURSORS": False, } } @@ -206,12 +208,6 @@ STATICFILES_FINDERS = ( # You can generate it using weblate/examples/generate-secret-key SECRET_KEY = "__KEY__" -_TEMPLATE_LOADERS = [ - "django.template.loaders.filesystem.Loader", - "django.template.loaders.app_directories.Loader", -] -if not DEBUG: - _TEMPLATE_LOADERS = [("django.template.loaders.cached.Loader", _TEMPLATE_LOADERS)] TEMPLATES = [ { "BACKEND": "django.template.backends.django.DjangoTemplates", @@ -225,8 +221,8 @@ TEMPLATES = [ "django.contrib.messages.context_processors.messages", "weblate.trans.context_processors.weblate_context", ], - "loaders": _TEMPLATE_LOADERS, }, + "APP_DIRS": True, } ] @@ -262,6 +258,14 @@ SOCIAL_AUTH_GITHUB_KEY = "" SOCIAL_AUTH_GITHUB_SECRET = "" SOCIAL_AUTH_GITHUB_SCOPE = ["user:email"] +SOCIAL_AUTH_GITHUB_ORG_KEY = "" +SOCIAL_AUTH_GITHUB_ORG_SECRET = "" +SOCIAL_AUTH_GITHUB_ORG_NAME = "" + +SOCIAL_AUTH_GITHUB_TEAM_KEY = "" +SOCIAL_AUTH_GITHUB_TEAM_SECRET = "" +SOCIAL_AUTH_GITHUB_TEAM_ID = "" + SOCIAL_AUTH_BITBUCKET_KEY = "" SOCIAL_AUTH_BITBUCKET_SECRET = "" SOCIAL_AUTH_BITBUCKET_VERIFIED_EMAILS_ONLY = True @@ -855,6 +859,7 @@ REST_FRAMEWORK = { else "rest_framework.permissions.IsAuthenticatedOrReadOnly" ], "DEFAULT_AUTHENTICATION_CLASSES": ( + "weblate.api.authentication.ProjectTokenAuthentication", "rest_framework.authentication.TokenAuthentication", "weblate.api.authentication.BearerAuthentication", "rest_framework.authentication.SessionAuthentication", diff --git a/manifest.json b/manifest.json index 88220a9..1cbfb96 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Translation platform using Git and Python", "fr": "Plateforme de traduction utilisant Git et Python" }, - "version": "4.9~ynh1", + "version": "4.10.1~ynh1", "url": "https://weblate.org", "upstream": { "license": "AGPL-3.0", diff --git a/scripts/_common.sh b/scripts/_common.sh index 4421e61..f8abf05 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -12,7 +12,7 @@ pkg_dependencies="libxml2-dev libxslt-dev libfreetype6-dev libjpeg-dev libz-dev libpq-dev libglib2.0-dev mailutils python-celery-common hub" # Weblate's version for PIP and settings file -weblate_version="4.9" +weblate_version="4.10.1" debian_maj_version=$(sed 's/\..*//' /etc/debian_version)