Merge c56d2a42416bb6be47562e57445f860605dd729f into 21af8150b7ba315a9f75264ab77813b0b7c697a8

[skip ci] Updated translations via Crowdin
git graph: don't show detached commits (#33645 )
2025-02-20 11:43:57 +08:00 · 2025-02-20 08:34:45 +08:00 · 2025-02-20 00:32:10 +00:00 · 2025-02-19 10:35:08 -08:00 · 2024-11-11 17:34:49 +01:00 · 2024-10-16 22:38:52 +02:00
4 changed files with 10 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -19,7 +19,10 @@ _test
 /gitea_*

 # MS VSCode
-.vscode
+.vscode/*
+!.vscode/settings.json
+!.vscode/launch.json
+!.vscode/extensions.json
 __debug_bin*

 *.cgo1.go
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -0,0 +1,3 @@
+{
+  "go.buildTags": "sqlite,sqlite_unlock_notify",
+}
--- a/options/locale/locale_pt-PT.ini
+++ b/options/locale/locale_pt-PT.ini
@ -1701,7 +1701,9 @@ issues.time_estimate_invalid=O formato da estimativa de tempo é inválido
 issues.start_tracking_history=começou a trabalhar %s
 issues.tracker_auto_close=O cronómetro será parado automaticamente quando esta questão for fechada
 issues.tracking_already_started=`Você já iniciou a contagem de tempo <a href="%s">noutra questão</a>!`
+issues.stop_tracking=Parar cronómetro
 issues.stop_tracking_history=trabalhou durante <b>%[1]s</b> %[2]s
+issues.cancel_tracking=Descartar
 issues.cancel_tracking_history=`cancelou a contagem de tempo %s`
 issues.del_time=Eliminar este registo de tempo
 issues.add_time_history=adicionou <b>%[1]s</b> de tempo gasto %[2]s
--- a/services/repository/gitgraph/graph.go
+++ b/services/repository/gitgraph/graph.go
@ -29,7 +29,7 @@ func GetCommitGraph(r *git.Repository, page, maxAllowedColors int, hidePRRefs bo
 	}

 	if len(branches) == 0 {
-		graphCmd.AddArguments("--all")
+		graphCmd.AddArguments("--tags", "--branches")
 	}

 	graphCmd.AddArguments("-C", "-M", "--date=iso-strict").
Author	SHA1	Message	Date
6543	81c15c39c0	Merge c56d2a42416bb6be47562e57445f860605dd729f into 21af8150b7ba315a9f75264ab77813b0b7c697a8	2025-02-20 08:34:45 +08:00
GiteaBot	21af8150b7	[skip ci] Updated translations via Crowdin	2025-02-20 00:32:10 +00:00
ericLemanissier	40faa6dc78	git graph: don't show detached commits (#33645 ) Some checks failed release-nightly / nightly-binary (push) Has been cancelled Details release-nightly / nightly-docker-rootful (push) Has been cancelled Details release-nightly / nightly-docker-rootless (push) Has been cancelled Details Current git graph is not usable for mirrors of repos having a lot of PRs, as can be seen at https://demo.gitea.com/ericLemanissier/conan-center-index/graph ![image](https://github.com/user-attachments/assets/ace40dd2-3eea-4d69-8e19-10fb7224e326) Manually running `git log --graph --date-order --all` on such a repo indeed shows: ``` * commit c4a34bd39d7977c8630177c5f88507000ea3e943 \|\ Merge: a4bbd3ad6b 35a102c77c \| \| Author: toge <toge.mail@gmail.com> \| \| Date: Wed Feb 19 08:36:41 2025 +0000 \| \| \| \| Merge 35a102c77cbc38d84baca0ca63466fb410336ea8 into a4bbd3ad6bb5a0f8e5117a897d8c55941f533d98 \| \| \| * commit 35a102c77cbc38d84baca0ca63466fb410336ea8 \| \| Author: toge <toge.mail@gmail.com> \| \| Date: Wed Feb 19 17:36:35 2025 +0900 \| \| \| \| update 4.4.2 \| \| \| \| * commit 5d610f4fd3c0428731e402a2f618fad9ce055875 \| \|/\| Merge: a4bbd3ad6b fe916fb70a \|/\| \| Author: Antony Peacock <ant.peacock@gmail.com> \| \| \| Date: Wed Feb 19 08:31:30 2025 +0000 \| \| \| \| \| \| Merge fe916fb70a8bf49503cce70a5c7124bcc4314ddc into a4bbd3ad6bb5a0f8e5117a897d8c55941f533d98 \| \| \| \| \| * commit fe916fb70a8bf49503cce70a5c7124bcc4314ddc \| \| \| Author: Antony Peacock <ant.peacock@gmail.com> \| \| \| Date: Wed Feb 19 08:31:18 2025 +0000 \| \| \| \| \| \| Remove parquet cmakelist patch \| \| \| \| \| \| * commit 9f6d2759d650ec3c86d01bb940e829e7e14220c2 \| \|_\|/\| Merge: a4bbd3ad6b f0963429b0 \|/\| \| \| Author: Thomas Sedlmair <thomas.sedlmair@googlemail.com> \| \| \| \| Date: Wed Feb 19 08:03:08 2025 +0100 \| \| \| \| \| \| \| \| Merge f0963429b0952499da0da7e559f8d53387097307 into a4bbd3ad6bb5a0f8e5117a897d8c55941f533d98 \| \| \| \| \| \| \| * commit f0963429b0952499da0da7e559f8d53387097307 \| \|_\|/ Author: Thomas Sedlmair <thomas.sedlmair@googlemail.com> \|/\| \| Date: Wed Feb 19 08:01:43 2025 +0100 \| \| \| \| \| \| added cwt-cucumber 2.5 \| \| \| ``` On the other hand, running `git log --graph --date-order --branches --tags` returns the expected: ``` * commit a4bbd3ad6bb5a0f8e5117a897d8c55941f533d98 (HEAD -> master) \| Author: Dan <mstr.danila@gmail.com> \| Date: Fri Feb 14 18:46:11 2025 +0200 \| \| grpc: add version 1.69.0 (#26446) \| \| * grpc: add version 1.69.0 \| \| * add cmake tool requires \| \| --------- \| \| Co-authored-by: Luis Caro Campos <3535649+jcar87@users.noreply.github.com> \| * commit a7868807cb2e21206ebf95278cb588f29a3e2205 \| Author: Guillaume Egles <gegles@users.noreply.github.com> \| Date: Thu Feb 13 05:44:35 2025 -0800 \| \| openssl: add versions `3.0.16`, `3.1.8`, `3.2.4`, `3.3.3`, `3.4.1`, stop publishing revisions for version `3.0.15` (#26578) \| * commit 86057d3e63ac71e2fe48c07bb301f2d54187044d \| Author: Luis Caro Campos <3535649+jcar87@users.noreply.github.com> \| Date: Thu Feb 13 13:34:41 2025 +0000 \| \| android-ndk: dont set LD and AS variables (#26581) \| \| * android-ndk: dont set LD and AS variables \| \| * android-ndk: refactor test package \| * commit 123e382fafd2f5e811e10faac02efc275c45ec2a \| Author: Nikita <root.kidik@gmail.com> \| Date: Thu Feb 13 12:29:39 2025 +0300 \| \| libffi: fix conditionals when building on Windows (#26500) \| \| * fix: add missing or `clang` \| \| * fix: libffi - always require as tool `automake` ```	2025-02-19 10:35:08 -08:00
6543	c56d2a4241	Merge branch 'main' into vscode-make-tests-work	2024-11-11 17:34:49 +01:00
6543	d73be9fd6f	save preoject specific settings for vscode e.g. allow to run tests from IDE	2024-10-16 22:38:52 +02:00