Merge branch 'master' into release/2.2

# Conflicts: # .github/workflows/docker-base.yml # .github/workflows/docker-demo.yml # wger/__init__.py # wger/locale/fr/LC_MESSAGES/django.po
wger-project · Dec 5, 2023 · bff492e · bff492e
2 parents 594a743 + e81e99e
commit bff492e
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/docker-base.yml b/.github/workflows/docker-base.yml
@@ -39,4 +39,4 @@ jobs:
           push: true
           file: extras/docker/base/Dockerfile
           platforms: linux/amd64,linux/arm64,linux/arm/v7
-          tags: wger/base:latest,wger/base:2.3-dev
+          tags: ${{ vars.REGISTRY_REPO }}/base:latest,${{ vars.REGISTRY_REPO }}/base:2.3-dev
diff --git a/.github/workflows/docker-demo.yml b/.github/workflows/docker-demo.yml
@@ -41,4 +41,4 @@ jobs:
           push: true
           file: extras/docker/demo/Dockerfile
           platforms: linux/amd64,linux/arm64
-          tags: wger/demo:latest,wger/demo:2.3-dev,wger/apache:latest,wger/apache:2.3-dev
+          tags: ${{ vars.REGISTRY_REPO }}/demo:latest,${{ vars.REGISTRY_REPO }}/demo:2.3-dev,${{ vars.REGISTRY_REPO }}/apache:latest,${{ vars.REGISTRY_REPO }}/apache:2.3-dev
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -8,8 +8,8 @@ on:
       - master
 
 env:
-  REGISTRY_IMAGE: wger/server
-  REGISTRY_IMAGE_ALT: wger/devel
+  REGISTRY_IMAGE: ${{ vars.REGISTRY_REPO }}/server
+  REGISTRY_IMAGE_ALT: ${{ vars.REGISTRY_REPO }}/devel
 
 jobs:
   build-prod:

diff --git a/extras/docker/development/settings.py b/extras/docker/development/settings.py
@@ -79,7 +79,7 @@
     EMAIL_HOST_USER = env.str("EMAIL_HOST_USER")
     EMAIL_HOST_PASSWORD = env.str("EMAIL_HOST_PASSWORD")
     EMAIL_USE_TLS = env.bool("EMAIL_USE_TLS", True)
-    EMAIL_USE_SSL = env.bool("EMAIL_USE_SSL", True)
+    EMAIL_USE_SSL = env.bool("EMAIL_USE_SSL", False)
     EMAIL_TIMEOUT = 60
 
 # Sender address used for sent emails

diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
     "masonry-layout": "^4.2.2",
     "popper.js": "^1.16.1",
     "shariff": "^3.3.0",
-    "yarn": "^1.22.19"
+    "yarn": "^1.22.21"
   },
   "scripts": {
     "build:css:sass": "sass wger/core/static/scss/main.scss:wger/core/static/yarn/bootstrap-compiled.css"

diff --git a/requirements.txt b/requirements.txt
@@ -43,7 +43,7 @@ flower==2.0.1
 django-cors-headers==4.3.1
 django-filter==23.4
 djangorestframework~=3.14
-djangorestframework-simplejwt[crypto]==5.3.0
+djangorestframework-simplejwt[crypto]==5.3.1
 
 # Not used anymore, but needed because some modules are imported in DB migration
 # files

diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -6,7 +6,7 @@
 -r requirements.txt
 
 # Building/installing
-wheel==0.41.3
+wheel==0.42.0
 
 # for ingredient import script from OFF
 pymongo==4.6.0

diff --git a/yarn.lock b/yarn.lock
@@ -381,7 +381,7 @@ shariff@^3.3.0:
     "@fortawesome/fontawesome-free" "^5.8.2"
     jquery "^3.4.1"
 
-yarn@^1.22.19:
-  version "1.22.19"
-  resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.19.tgz#4ba7fc5c6e704fce2066ecbfb0b0d8976fe62447"
-  integrity sha512-/0V5q0WbslqnwP91tirOvldvYISzaqhClxzyUKXYxs07yUILIs5jx/k6CFe8bvKSkds5w+eiOqta39Wk3WxdcQ==
+yarn@^1.22.21:
+  version "1.22.21"
+  resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.21.tgz#1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
+  integrity sha512-ynXaJsADJ9JiZ84zU25XkPGOvVMmZ5b7tmTSpKURYwgELdjucAOydqIOrOfTxVYcNXe91xvLZwcRh68SR3liCg==