From 2bbdf88e22fa80ebc9b215963f040307003ff9e6 Mon Sep 17 00:00:00 2001 From: Vlad Korneev Date: Tue, 30 Dec 2025 17:51:17 +0300 Subject: [PATCH 1/2] chore: update towncrier type to use feat insead of feature --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 06cc2ec..6657923 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -151,7 +151,7 @@ issue_format = "[#{issue}](https://github.com/LandSight/backend/issues/{issue})" [[tool.towncrier.type]] name = "Feature" -directory = "feature" +directory = "feat" showcontent = true [[tool.towncrier.type]] From 782ccba72d3aef7d9f4c198d8760f6a8142f757c Mon Sep 17 00:00:00 2001 From: Vlad Korneev Date: Tue, 30 Dec 2025 17:51:25 +0300 Subject: [PATCH 2/2] docs: use feat instead of feature --- docs/standarts/branching.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/standarts/branching.md b/docs/standarts/branching.md index 0d7de14..3f1a4d8 100644 --- a/docs/standarts/branching.md +++ b/docs/standarts/branching.md @@ -16,7 +16,7 @@ and release workflows. Supporting branches are used for implementing changes and preparing releases. -- `feature/` — development of new functionality. +- `feat/` — development of new functionality. - `bugfix/-` — fixes for non-critical bugs. - `hotfix/` — urgent fixes for critical issues in released versions. - `release/` — release preparation and stabilization. @@ -31,7 +31,7 @@ Supporting branches are used for implementing changes and preparing releases. - The `develop` branch may contain work-in-progress functionality but must remain in a working state. -- `feature/*` and `bugfix/*` branches: +- `feat/*` and `bugfix/*` branches: - are created from `develop` - are merged back into `develop` via pull requests @@ -58,7 +58,7 @@ General rules: Examples: ```text -feature/ +feat/ bugfix/- hotfix/ release/