Merge branch 'renovate/codeberg.org-forgejo-forgejo-14.x' of ssh://git.coopcloud.tech:2222/coop-cloud/forgejo into renovate/codeberg.org-forgejo-forgejo-14.x

.env.sample

@@ -15,7 +15,6 @@ SECRET_LFS_JWT_SECRET_VERSION=v1 # length=43
 
 GITEA_DOMAIN="${DOMAIN}"
 GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true
-GITEA_ALLOW_ONLY_INTERNAL_REGISTRATION=false
 GITEA_APP_NAME="Git with solidaritea"
 GITEA_AUTO_WATCH_NEW_REPOS=false
 GITEA_DISABLE_REGISTRATION=false
@@ -37,7 +36,6 @@ GITEA_REQUIRE_SIGNIN_VIEW=true
 GITEA_ENABLE_PUSH_CREATE_USER=false
 GITEA_ENABLE_PUSH_CREATE_ORG=false
 GITEA_LFS_START_SERVER=false
-GITEA_MAX_CREATION_LIMIT=-1
 
 GITEA_REPO_UPLOAD_ENABLED=true
 GITEA_REPO_UPLOAD_ALLOWED_TYPES=*/*
@@ -56,17 +54,6 @@ SECRET_DB_ROOT_PASSWORD_VERSION=v1
 SECRET_JWT_SECRET_VERSION=v1 # length=43
 SECRET_SECRET_KEY_VERSION=v1 # length=64
 
-# Change to "minio" an configure to enable S3 storage
-# https://forgejo.org/docs/latest/admin/setup/storage/
-GITEA_STORAGE_TYPE=local
-# MINIO_ENDPOINT=
-# MINIO_ACCESS_KEY_ID=
-# MINIO_SECRET_ACCESS_KEY=
-# MINIO_BUCKET=
-# MINIO_BUCKET_LOOKUP=auto
-# MINIO_LOCATION=garage
-# MINIO_CHECKSUM_ALGORITHM=default
-
 # SMTP Mailer
 # COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
 # GITEA_SMTP_MAILER_ENABLED=1

abra.sh

@@ -1,4 +1,4 @@
-export APP_INI_VERSION=v25
+export APP_INI_VERSION=v23
 export DOCKER_SETUP_SH_VERSION=v1
 export PG_BACKUP_VERSION=v1
 

app.ini.tmpl

@@ -16,24 +16,8 @@ PATH = {{ env "GITEA_PATH" }}
 DISABLE_GRAVATAR = {{ env "GITEA_DISABLE_GRAVATAR" }}
 ENABLE_FEDERATED_AVATAR = {{ env "GITEA_ENABLE_FEDERATED_AVATAR" }}
 
-[storage]
-STORAGE_TYPE = {{ env "GITEA_STORAGE_TYPE" }}
-{{ if eq (env "GITEA_STORAGE_TYPE") "minio" }}
-SERVE_DIRECT = false
-MINIO_ENDPOINT = {{ env "MINIO_ENDPOINT" }}
-MINIO_ACCESS_KEY_ID = {{ env "MINIO_ACCESS_KEY_ID" }}
-MINIO_SECRET_ACCESS_KEY = {{ env "MINIO_SECRET_ACCESS_KEY" }}
-MINIO_BUCKET = {{ env "MINIO_BUCKET" }}
-MINIO_BUCKET_LOOKUP = {{ env "MINIO_BUCKET_LOOKUP" }}
-MINIO_LOCATION = {{ env "MINIO_LOCATION" }}
-MINIO_USE_SSL = true
-MINIO_INSECURE_SKIP_VERIFY = false
-MINIO_CHECKSUM_ALGORITHM = {{ env "MINIO_CHECKSUM_ALGORITHM" }}
-{{ end }}
-
 [service]
 ALLOW_ONLY_EXTERNAL_REGISTRATION = {{ env "GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION" }}
-ALLOW_ONLY_INTERNAL_REGISTRATION = {{ env "GITEA_ALLOW_ONLY_INTERNAL_REGISTRATION" }}
 AUTO_WATCH_NEW_REPOS = {{ env "GITEA_AUTO_WATCH_NEW_REPOS" }}
 DISABLE_REGISTRATION = {{ env "GITEA_DISABLE_REGISTRATION" }}
 ENABLE_NOTIFY_MAIL = {{ env "GITEA_ENABLE_NOTIFY_MAIL" }}
@@ -54,7 +38,6 @@ ENABLE_OPENID_SIGNUP = {{ env "GITEA_ENABLE_OPENID_SIGNUP" }}
 DEFAULT_BRANCH = main
 ENABLE_PUSH_CREATE_USER = {{ env "GITEA_ENABLE_PUSH_CREATE_USER" }}
 ENABLE_PUSH_CREATE_ORG = {{ env "GITEA_ENABLE_PUSH_CREATE_ORG" }}
-MAX_CREATION_LIMIT = {{ env "GITEA_MAX_CREATION_LIMIT" }}
 
 [repository.upload]
 ENABLED = {{ env "GITEA_REPO_UPLOAD_ENABLED" }}

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: codeberg.org/forgejo/forgejo:14.0.4-rootless
+    image: codeberg.org/forgejo/forgejo:14.0.1-rootless
     configs:
       - source: app_ini
         target: /etc/gitea/app.ini
@@ -17,7 +17,6 @@ services:
       - lfs_jwt_secret
     environment:
       - GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION
-      - GITEA_ALLOW_ONLY_INTERNAL_REGISTRATION
       - GITEA_APP_NAME
       - GITEA_AUTO_WATCH_NEW_REPOS
       - GITEA_DISABLE_REGISTRATION
@@ -56,7 +55,6 @@ services:
       - GITEA__oauth2__REFRESH_TOKEN_EXPIRATION_TIME
       - GITEA_LFS_START_SERVER=${GITEA_LFS_START_SERVER:-false}
       - GITEA_ENABLE_INTERNAL_SIGNIN
-      - GITEA_MAX_CREATION_LIMIT=${GITEA_MAX_CREATION_LIMIT:--1}
     volumes:
       - data:/var/lib/gitea
       - config:/etc/gitea
@@ -91,7 +89,7 @@ services:
         - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}"
         - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100"
         - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true"
-        - coop-cloud.${STACK_NAME}.version=5.1.2+14.0.4-rootless
+        - coop-cloud.${STACK_NAME}.version=5.0.3+13.0.4-rootless
 
 
 networks:

release/5.1.0+14.0.1-rootless

@@ -1 +0,0 @@
-https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/14.0.0.md https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/14.0.1.md

renovate.json

@@ -4,7 +4,6 @@
     "config:recommended"
   ],
   "reviewers": [
-    "fauno",
-    "p4u1"
+    "team:forgejo-maintainers"
   ]
 }