Merge pre-dev: fix api_hub_dispatcher → api_config

Merge master: fix api_hub_dispatcher → api_config
Merge pre-dev: fix env_file docker-compose
2026-04-17 01:13:56 +02:00 · 2026-04-17 01:13:54 +02:00 · 2026-04-17 01:06:34 +02:00 · 2026-04-17 01:06:31 +02:00 · 2026-04-17 01:05:40 +02:00 · 2026-04-17 01:05:37 +02:00
1 changed files with 1 additions and 8 deletions
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -80,17 +80,10 @@ class MiVista(APIView):
 pre-dev  →  dev  →  master
 ```

- `pre-dev`: desarrollo activo — aquí entran todos los cambios
+- `pre-dev`: desarrollo activo
 - `dev`: validación previa a producción
 - `master`: producción estable
 - Merges siempre con `--no-ff`
- **NUNCA** propagar en sentido inverso (master → dev o dev → pre-dev)
- Secuencia correcta:
-  ```bash
-  git checkout pre-dev && git merge <mi-cambio> --no-ff
-  git checkout dev     && git merge pre-dev --no-ff && git push origin dev
-  git checkout master  && git merge dev --no-ff     && git push origin master
-  ```

 ## Estructura de app Django
Author	SHA1	Message	Date
juanjo	379ce825f6	Merge pre-dev: fix api_hub_dispatcher → api_config All checks were successful DEPLOY_MULTI_BRACH/pipeline/head This commit looks good Details	2026-04-17 01:13:56 +02:00
juanjo	d7a84a4dfa	Merge master: fix api_hub_dispatcher → api_config All checks were successful DEPLOY_MULTI_BRACH/pipeline/head This commit looks good Details	2026-04-17 01:13:54 +02:00
juanjo	abe67a7f20	Merge pre-dev: fix env_file docker-compose All checks were successful DEPLOY_MULTI_BRACH/pipeline/head This commit looks good Details	2026-04-17 01:06:34 +02:00
juanjo	cac00a4f8c	Merge master: fix env_file docker-compose All checks were successful DEPLOY_MULTI_BRACH/pipeline/head This commit looks good Details	2026-04-17 01:06:31 +02:00
juanjo	5367ba7313	Merge pre-dev: fix env_file path docker-compose All checks were successful DEPLOY_MULTI_BRACH/pipeline/head This commit looks good Details	2026-04-17 01:05:40 +02:00
juanjo	b8c3e03348	fix: corregir env_file path en docker-compose (../.env → .env) All checks were successful DEPLOY_MULTI_BRACH/pipeline/head This commit looks good Details Jenkins copia el secret a deployments/.env — el path debe ser relativo al docker-compose.yml, no a la raíz del workspace. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-17 01:05:37 +02:00
juanjo	23cd4bf8b4	Merge pre-dev: gunicorn + wait-for-db + healthcheck Some checks failed DEPLOY_MULTI_BRACH/pipeline/head There was a failure building this commit Details	2026-04-17 00:39:30 +02:00
juanjo	b43ca9d919	Merge branch 'dev' of https://git.v-encore-lab.com/Proyecto-SaaS/django-core-base into dev	2026-04-17 00:39:30 +02:00
juanjo	252e176e9d	Merge master: gunicorn + wait-for-db + healthcheck All checks were successful DEPLOY_MULTI_BRACH/pipeline/head This commit looks good Details	2026-04-17 00:39:27 +02:00
juanjo	adaf20bd8e	Merge pre-dev: revert api_config	2026-04-16 23:31:29 +02:00
juanjo	30c540b6f9	revert: restaurar nombre api_config (revertir renombrado erróneo) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-16 23:31:08 +02:00
juanjo	95e036108d	Merge pre-dev: renombrar api_config → api_hub_dispatcher	2026-04-16 23:28:44 +02:00
juanjo	778753afd6	refactor: renombrar proyecto principal api_config → api_hub_dispatcher - Renombrar carpeta app/api_config/ → app/api_hub_dispatcher/ - Actualizar DJANGO_SETTINGS_MODULE en asgi.py, wsgi.py, manage.py - Actualizar ROOT_URLCONF y WSGI_APPLICATION en settings.py Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-16 23:28:43 +02:00