diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c76a765089bcbfdf51d6f6433d6516270aa71dd6..9b092e8276594e961761db6e4130aaea45c04053 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -283,6 +283,7 @@ black: before_script: - apk add --update --no-cache curl jq script: + - if [ `curl -s "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/pipelines?ref=${TARGET_BRANCH}&status=success&private_token=${PRIVATE_TOKEN}"` == "[]" ]; then echo "no prior run on ${TARGET_BRANCH}, good to go."; exit 0; fi - TARGET_PIPELINE_ID=`curl -s "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/pipelines?ref=${TARGET_BRANCH}&status=success&private_token=${PRIVATE_TOKEN}" | jq ".[0].id"` - TARGET_COVERAGE=`curl -s "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/pipelines/${TARGET_PIPELINE_ID}/jobs?private_token=${PRIVATE_TOKEN}" | jq --arg JOB_NAME "$JOB_NAME" '.[] | select(.name==$JOB_NAME) | .coverage' | cut -d. -f1` - CURRENT_COVERAGE=`curl -s "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/pipelines/${CI_PIPELINE_ID}/jobs?private_token=${PRIVATE_TOKEN}" | jq --arg JOB_NAME "$JOB_NAME" '.[] | select(.name==$JOB_NAME) | .coverage' | cut -d. -f1` diff --git a/chart/values.prod.yaml b/chart/values.prod.yaml index c296be870abf9c0ca54e749f86facd0180bf4128..76f9a7697b86669334394b9a7bb2f8dea756013d 100644 --- a/chart/values.prod.yaml +++ b/chart/values.prod.yaml @@ -1,7 +1,7 @@ resources: limits: memory: "2Gi" - cpu: "2000m" + cpu: "1800m" admin_email: "strass-admin@pasteur.fr" isProd: true diff --git a/src/strass/requirements.txt b/src/strass/requirements.txt index bbbc6f82ed76be72fdc37d5bce791b2a024344e7..5667e5b6a8ea2ab312b545b1ddf82429c076205a 100644 --- a/src/strass/requirements.txt +++ b/src/strass/requirements.txt @@ -4,7 +4,7 @@ django-crispy-forms~=2.0 crispy-bootstrap4 python-decouple --extra-index-url https://gitlab.pasteur.fr/api/v4/projects/bbrancot%2Fdjango-basetheme-bootstrap/packages/pypi/simple -django-basetheme-bootstrap>=1.8.2 +django-basetheme-bootstrap>=1.8.4 --extra-index-url https://gitlab.pasteur.fr/api/v4/projects/hub%2Fdjango-kubernetes-probes/packages/pypi/simple django-kubernetes-probes>=1.1 --extra-index-url https://gitlab.pasteur.fr/api/v4/projects/bbrancot%2Fdjango-basetheme-bootstrap-ebaii-theme/packages/pypi/simple @@ -24,7 +24,7 @@ pulp tblib # needed when running django tests in parallele to get the error when failing tqdm gunicorn -qrcode +qrcode[pil] python-magic # to check mime type django-csp #END OF FILE diff --git a/src/strass/strass/settings.py b/src/strass/strass/settings.py index 365fc82398903bd814f3e14db01c772722a9323f..d37e67b348803b3d64f1d407fc46c0f768ba408d 100644 --- a/src/strass/strass/settings.py +++ b/src/strass/strass/settings.py @@ -260,9 +260,7 @@ CSP_IMG_SRC = [ "data:", ] CSP_EXCLUDE_URL_PREFIXES = ( - "/candidate/apply/Information/", - "/candidate/edit/Information/", - "/setup/settings/import/", + # "/candidate/", ) CSP_REPORT_URI = reverse_lazy('cspmailreports:csp-report') diff --git a/src/strass/strass_app/static/js/datatables.url.en.js b/src/strass/strass_app/static/js/datatables.url.en.js index d6cb22249f3c5ce81886557e68a2812d4c082d8b..3631dfc9897d91bea8422063874525e1d0f515b4 100644 --- a/src/strass/strass_app/static/js/datatables.url.en.js +++ b/src/strass/strass_app/static/js/datatables.url.en.js @@ -1 +1 @@ -var datatables_language_url = "https://cdn.datatables.net/plug-ins/1.13.10/i18n/English.json"; \ No newline at end of file +var datatables_language_url = "https://cdn.datatables.net/plug-ins/1.13.10/i18n/en-GB.json"; \ No newline at end of file diff --git a/src/strass/strass_app/static/js/datatables.url.fr.js b/src/strass/strass_app/static/js/datatables.url.fr.js index 2f72f327026f95361547ddad64eb0686410e486d..1ff2dc9f69980ae96ac1a9595d602a0949f0dc21 100644 --- a/src/strass/strass_app/static/js/datatables.url.fr.js +++ b/src/strass/strass_app/static/js/datatables.url.fr.js @@ -1 +1 @@ -var datatables_language_url = "https://cdn.datatables.net/plug-ins/1.13.10/i18n/French.json"; \ No newline at end of file +var datatables_language_url = "https://cdn.datatables.net/plug-ins/1.13.10/i18n/fr-FR.json"; \ No newline at end of file