Skip to content

Commit e67766c

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Send email on Workflow Run Success/Failure (go-gitea#34982) [skip ci] Updated translations via Crowdin Replace `poetry` with `uv` (go-gitea#35084) nix flake update (go-gitea#35085) Use monospace font in PR command line instructions (go-gitea#35074) Add gitignore rules to exclude LLM instruction files (go-gitea#35076) [skip ci] Updated translations via Crowdin Fix form property assignment edge case (go-gitea#35073) Improve submodule relative path handling (go-gitea#35056) Fixed all grammatical errors in locale_en-US.ini (go-gitea#35053) UI: add hover background to table rows in user and repo admin page (go-gitea#35072)
2 parents 3f8c574 + 0d00ec7 commit e67766c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+898
-1023
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"version": "lts"
88
},
99
"ghcr.io/devcontainers/features/git-lfs:1.2.2": {},
10-
"ghcr.io/devcontainers-extra/features/poetry:2": {},
10+
"ghcr.io/jsburckhardt/devcontainer-features/uv:1": {},
1111
"ghcr.io/devcontainers/features/python:1": {
1212
"version": "3.12"
1313
},

.github/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ modifies/dependencies:
6161
- "package.json"
6262
- "package-lock.json"
6363
- "pyproject.toml"
64-
- "poetry.lock"
64+
- "uv.lock"
6565
- "go.mod"
6666
- "go.sum"
6767

.github/workflows/files-changed.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
- "tools/lint-templates-*.js"
7878
- "templates/**/*.tmpl"
7979
- "pyproject.toml"
80-
- "poetry.lock"
80+
- "uv.lock"
8181
8282
docker:
8383
- "Dockerfile"
@@ -98,4 +98,3 @@ jobs:
9898
- "**/*.yaml"
9999
- ".yamllint.yaml"
100100
- "pyproject.toml"
101-
- "poetry.lock"

.github/workflows/pull-compliance.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
node-version: 24
4141
cache: npm
4242
cache-dependency-path: package-lock.json
43-
- run: pip install poetry
43+
- run: pip install uv
4444
- run: make deps-py
4545
- run: make deps-frontend
4646
- run: make lint-templates
@@ -54,7 +54,7 @@ jobs:
5454
- uses: actions/setup-python@v5
5555
with:
5656
python-version: "3.12"
57-
- run: pip install poetry
57+
- run: pip install uv
5858
- run: make deps-py
5959
- run: make lint-yaml
6060

.gitignore

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,15 @@ prime/
109109

110110
# Manpage
111111
/man
112+
113+
# Ignore AI/LLM instruction files
114+
/.claude/
115+
/.cursorrules
116+
/.cursor/
117+
/.goosehints
118+
/.windsurfrules
119+
/.github/copilot-instructions.md
120+
/AGENT.md
121+
/CLAUDE.md
122+
/llms.txt
123+

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -393,11 +393,11 @@ lint-actions: ## lint action workflow files
393393
.PHONY: lint-templates
394394
lint-templates: .venv node_modules ## lint template files
395395
@node tools/lint-templates-svg.js
396-
@poetry run djlint $(shell find templates -type f -iname '*.tmpl')
396+
@uv run djlint $(shell find templates -type f -iname '*.tmpl')
397397

398398
.PHONY: lint-yaml
399399
lint-yaml: .venv ## lint yaml files
400-
@poetry run yamllint -s .
400+
@uv run yamllint -s .
401401

402402
.PHONY: watch
403403
watch: ## watch everything and continuously rebuild
@@ -829,8 +829,8 @@ node_modules: package-lock.json
829829
npm install --no-save
830830
@touch node_modules
831831

832-
.venv: poetry.lock
833-
poetry install
832+
.venv: uv.lock
833+
uv sync
834834
@touch .venv
835835

836836
.PHONY: update
@@ -848,8 +848,8 @@ update-js: node-check | node_modules ## update js dependencies
848848
.PHONY: update-py
849849
update-py: node-check | node_modules ## update py dependencies
850850
npx updates -u -f pyproject.toml
851-
rm -rf .venv poetry.lock
852-
poetry install
851+
rm -rf .venv uv.lock
852+
uv sync
853853
@touch .venv
854854

855855
.PHONY: webpack

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
# linting
2828
python312
29-
poetry
29+
uv
3030

3131
# backend
3232
go_1_24

models/user/setting_keys.go renamed to models/user/setting_options.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,9 @@ const (
2121
SignupUserAgent = "signup.user_agent"
2222

2323
SettingsKeyCodeViewShowFileTree = "code_view.show_file_tree"
24+
25+
SettingsKeyEmailNotificationGiteaActions = "email_notification.gitea_actions"
26+
SettingEmailNotificationGiteaActionsAll = "all"
27+
SettingEmailNotificationGiteaActionsFailureOnly = "failure-only" // Default for actions email preference
28+
SettingEmailNotificationGiteaActionsDisabled = "disabled"
2429
)

modules/git/commit_info.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,20 @@
33

44
package git
55

6+
import "path"
7+
68
// CommitInfo describes the first commit with the provided entry
79
type CommitInfo struct {
810
Entry *TreeEntry
911
Commit *Commit
1012
SubmoduleFile *CommitSubmoduleFile
1113
}
14+
15+
func getCommitInfoSubmoduleFile(repoLink string, entry *TreeEntry, commit *Commit, treePathDir string) (*CommitSubmoduleFile, error) {
16+
fullPath := path.Join(treePathDir, entry.Name())
17+
submodule, err := commit.GetSubModule(fullPath)
18+
if err != nil {
19+
return nil, err
20+
}
21+
return NewCommitSubmoduleFile(repoLink, fullPath, submodule.URL, entry.ID.String()), nil
22+
}

0 commit comments

Comments
 (0)