Merge pull request 'Fix migration order for approval tables' (#4 ) from fix/migration-order into master

Reviewed-on: #4
Fix migration order so approval_workflows runs before approval_steps
2026-03-06 09:38:00 +08:00 · 2026-03-06 01:37:11 +00:00 · 2026-03-06 09:13:12 +08:00 · 2026-03-05 13:54:25 +08:00
2 changed files with 0 additions and 11 deletions
--- a/compose.yaml
+++ b/compose.yaml
@@ -115,17 +115,6 @@ services:
                - '${LDAP_ADMIN_PASSWORD:-adminpassword}'
            retries: 3
            timeout: 5s
    phpldapadmin:
        image: 'osixia/phpldapadmin:latest'
        ports:
            - '${FORWARD_PHPLDAPADMIN_PORT:-8085}:80'
        environment:
            PHPLDAPADMIN_LDAP_HOSTS: openldap
            PHPLDAPADMIN_HTTPS: 'false'
        networks:
            - sail
        depends_on:
            - openldap
 networks:
    sail:
        driver: bridge
--- a/database/migrations/2026_03_05_020958_create_approval_workflows_table.php
+++ b/database/migrations/2026_03_05_020958_create_approval_workflows_table.php
Author	SHA1	Message	Date
timmybee	2b9b2fd32d	Merge pull request 'Fix migration order for approval tables' (#4 ) from fix/migration-order into master Some checks failed linter / quality (push) Successful in 1m23s Details security / Static Analysis (push) Has been cancelled Details security / Dependency Audit (push) Has been cancelled Details tests / ci (8.4) (push) Has been cancelled Details tests / ci (8.5) (push) Has been cancelled Details Reviewed-on: #4	2026-03-06 09:38:00 +08:00
Tim Basten	35f3af9efe	Fix migration order so approval_workflows runs before approval_steps All checks were successful linter / quality (pull_request) Successful in 1m21s Details tests / ci (8.4) (pull_request) Successful in 1m25s Details tests / ci (8.5) (pull_request) Successful in 1m28s Details The approval_steps migration references approval_workflows via a foreign key, but both had the same timestamp (020959), causing steps to run first alphabetically and fail. Moved workflows to 020958 so it runs first.	2026-03-06 01:37:11 +00:00
timmybee	95d953cf13	Merge pull request 'Consolidate Docker Compose into single compose.yaml' (#3 ) from fix/consolidate-docker-compose into master All checks were successful linter / quality (push) Successful in 1m32s Details security / Dependency Audit (push) Successful in 1m22s Details security / Static Analysis (push) Successful in 1m20s Details tests / ci (8.4) (push) Successful in 1m31s Details tests / ci (8.5) (push) Successful in 1m26s Details Reviewed-on: #3	2026-03-06 09:13:12 +08:00
timmybee	d2f7812432	Merge pull request 'Add code security checks workflow' (#2 ) from feature/security-checks into master All checks were successful linter / quality (push) Successful in 1m30s Details security / Dependency Audit (push) Successful in 1m26s Details security / Static Analysis (push) Successful in 1m33s Details tests / ci (8.4) (push) Successful in 1m30s Details tests / ci (8.5) (push) Successful in 1m29s Details Reviewed-on: #2	2026-03-05 13:54:25 +08:00