chore: merge release 1.1.0 into sync branch (WealthLedger/main#30) #88

Closed
codex-bot wants to merge 2 commits from main into chore/30-sync-from-develop
Owner

Summary

Step 1 of 2. Merge main (release v1.1.0) into a branch cut from current develop, so the branch is not outdated and the old merge commits of develop are not re-linted. main and the tag are untouched.

Linked Issue

WealthLedger/main#30

Merge

Plain merge commit, no squash and no rebase. Supersedes WealthLedger/frontend#68 and #87.

## Summary Step 1 of 2. Merge `main` (release `v1.1.0`) into a branch cut from current `develop`, so the branch is not outdated and the old merge commits of `develop` are not re-linted. `main` and the tag are untouched. ## Linked Issue WealthLedger/main#30 ## Merge Plain merge commit, no squash and no rebase. Supersedes WealthLedger/frontend#68 and #87.
codex-bot added 2 commits 2026-10-16 07:56:30 +03:00
chore(release): 1.1.0
Frontend verify / commits (pull_request) Failing after 42s
Frontend verify / security (pull_request) Skipped
Frontend verify / verify (pull_request) Skipped
9d900b331a
ci: validate release PR commits independently (WealthLedger/main#30)
Frontend verify / commits (push) Skipped
Frontend verify / security (push) Successful in 10s
Frontend image / publish (push) Successful in 6m45s
Frontend verify / verify (push) Successful in 6m7s
Frontend verify / commits (pull_request) Successful in 37s
Frontend verify / security (pull_request) Successful in 9s
Frontend verify / verify (pull_request) Successful in 5m58s
c7d8d2c8f9
Author
Owner

Закрывается как устаревший: back-merge main → develop отменён в WealthLedger/main#34 (коммит 0bdc409), merge-коммиты запрещены.

Подтверждение отсутствия потерь:

$ git merge-base --is-ancestor origin/main origin/develop && echo ok
ok
$ git rev-list --count origin/develop..origin/main
0

origin/main (c7d8d2c, тег v1.1.0) — предок origin/develop (eefdde2). Все изменения релиза уже в develop.

Ветки chore/30-sync-from-develop и chore/30-sync-release будут удалены в рамках очистки веток.

Закрывается как устаревший: back-merge `main → develop` отменён в `WealthLedger/main#34` (коммит `0bdc409`), merge-коммиты запрещены. Подтверждение отсутствия потерь: ``` $ git merge-base --is-ancestor origin/main origin/develop && echo ok ok $ git rev-list --count origin/develop..origin/main 0 ``` `origin/main` (`c7d8d2c`, тег `v1.1.0`) — предок `origin/develop` (`eefdde2`). Все изменения релиза уже в `develop`. Ветки `chore/30-sync-from-develop` и `chore/30-sync-release` будут удалены в рамках очистки веток.
codex-bot closed this pull request 2026-10-17 19:31:57 +03:00

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
No Reviewers
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: WealthLedger/frontend#88