Skip to content

Commit f0e7544

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Display total blob size of a package version. (go-gitea#20927) Display all files. (go-gitea#20917) Enhance package date display (go-gitea#20928) [skip ci] Updated translations via Crowdin Forbid HTML string tooltips (go-gitea#20935) Set no-tags in git fetch on compare (go-gitea#20893) Update comparison.en-us.md: link subgroups issue (go-gitea#20905) Enable contenthash in filename for dynamic assets (go-gitea#20813) refactor webhook *EditPost (go-gitea#20780)
2 parents 550dc02 + 9e0c437 commit f0e7544

File tree

23 files changed

+1369
-1350
lines changed

23 files changed

+1369
-1350
lines changed

‎docs/content/doc/features/comparison.en-us.md‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,24 @@ _Symbols used in table:_
3535

3636
| Feature | Gitea | Gogs | GitHub EE | GitLab CE | GitLab EE | BitBucket | RhodeCode CE |
3737
| ----------------------------------- | ---------------------------------------------------| ---- | --------- | --------- | --------- | -------------- | ------------ |
38-
| Open source and free | ✓ | ✓ | ✘ | ✓ | ✘ | ✘ | ✓ |
39-
| Low resource usage (RAM/CPU) | ✓ | ✓ | ✘ | ✘ | ✘ | ✘ | ✘ |
40-
| Multiple database support | ✓ | ✓ | ✘ | ⁄ | ⁄ | ✓ | ✓ |
41-
| Multiple OS support | ✓ | ✓ | ✘ | ✘ | ✘ | ✘ | ✓ |
42-
| Easy upgrade process | ✓ | ✓ | ✘ | ✓ | ✓ | ✘ | ✓ |
43-
| Markdown support | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
44-
| Orgmode support | ✓ | ✘ | ✓ | ✘ | ✘ | ✘ | ? |
45-
| CSV support | ✓ | ✘ | ✓ | ✘ | ✘ | ✓ | ? |
46-
| Third-party render tool support | ✓ | ✘ | ✘ | ✘ | ✘ | ✓ | ? |
47-
| Static Git-powered pages | [✘](https://github.com/go-gitea/gitea/issues/302) | ✘ | ✓ | ✓ | ✓ | ✘ | ✘ |
48-
| Integrated Git-powered wiki | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ (cloud only) | ✘ |
49-
| Deploy Tokens | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
50-
| Repository Tokens with write rights | ✓ | ✘ | ✓ | ✓ | ✓ | ✓ | ✓ |
51-
| Built-in Package/Container Registry | ✓ | ✘ | ✓ | ✓ | ✓ | ✘ | ✘ |
52-
| External git mirroring | ✓ | ✓ | ✘ | ✘ | ✓ | ✓ | ✓ |
53-
| WebAuthn (2FA) | ✓ | ✘ | ✓ | ✓ | ✓ | ✓ | ? |
54-
| Built-in CI/CD | ✘ | ✘ | ✓ | ✓ | ✓ | ✘ | ✘ |
55-
| Subgroups: groups within groups | ✘ | ✘ | ✘ | ✓ | ✓ | ✘ | ✓ |
38+
| Open source and free | ✓ | ✓ | ✘ | ✓ | ✘ | ✘ | ✓ |
39+
| Low resource usage (RAM/CPU) | ✓ | ✓ | ✘ | ✘ | ✘ | ✘ | ✘ |
40+
| Multiple database support | ✓ | ✓ | ✘ | ⁄ | ⁄ | ✓ | ✓ |
41+
| Multiple OS support | ✓ | ✓ | ✘ | ✘ | ✘ | ✘ | ✓ |
42+
| Easy upgrade process | ✓ | ✓ | ✘ | ✓ | ✓ | ✘ | ✓ |
43+
| Markdown support | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
44+
| Orgmode support | ✓ | ✘ | ✓ | ✘ | ✘ | ✘ | ? |
45+
| CSV support | ✓ | ✘ | ✓ | ✘ | ✘ | ✓ | ? |
46+
| Third-party render tool support | ✓ | ✘ | ✘ | ✘ | ✘ | ✓ | ? |
47+
| Static Git-powered pages | [✘](https://github.com/go-gitea/gitea/issues/302) | ✘ | ✓ | ✓ | ✓ | ✘ | ✘ |
48+
| Integrated Git-powered wiki | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ (cloud only) | ✘ |
49+
| Deploy Tokens | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
50+
| Repository Tokens with write rights | ✓ | ✘ | ✓ | ✓ | ✓ | ✓ | ✓ |
51+
| Built-in Package/Container Registry | ✓ | ✘ | ✓ | ✓ | ✓ | ✘ | ✘ |
52+
| External git mirroring | ✓ | ✓ | ✘ | ✘ | ✓ | ✓ | ✓ |
53+
| WebAuthn (2FA) | ✓ | ✘ | ✓ | ✓ | ✓ | ✓ | ? |
54+
| Built-in CI/CD | ✘ | ✘ | ✓ | ✓ | ✓ | ✘ | ✘ |
55+
| Subgroups: groups within groups | [✘](https://github.com/go-gitea/gitea/issues/1872) | ✘ | ✘ | ✓ | ✓ | ✘ | ✓ |
5656

5757
## Code management
5858

‎jest.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export default {
22
rootDir: 'web_src',
33
setupFilesAfterEnv: ['jest-extended/all'],
4-
testEnvironment: '@happy-dom/jest-environment',
4+
testEnvironment: 'jest-environment-jsdom',
55
testMatch: ['<rootDir>/**/*.test.js'],
66
testTimeout: 20000,
77
transform: {

‎modules/git/repo_compare.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func (repo *Repository) GetMergeBase(tmpRemote, base, head string) (string, stri
4040
if tmpRemote != "origin" {
4141
tmpBaseName := RemotePrefix + tmpRemote + "/tmp_" + base
4242
// Fetch commit into a temporary branch in order to be able to handle commits and tags
43-
_, _, err := NewCommand(repo.Ctx, "fetch", tmpRemote, base+":"+tmpBaseName).RunStdString(&RunOpts{Dir: repo.Path})
43+
_, _, err := NewCommand(repo.Ctx, "fetch", "--no-tags", tmpRemote, "--", base+":"+tmpBaseName).RunStdString(&RunOpts{Dir: repo.Path})
4444
if err == nil {
4545
base = tmpBaseName
4646
}

‎modules/setting/setting.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ var (
9292
// LocalURL is the url for locally running applications to contact Gitea. It always has a '/' suffix
9393
// It maps to ini:"LOCAL_ROOT_URL"
9494
LocalURL string
95+
// AssetVersion holds a opaque value that is used for cache-busting assets
96+
AssetVersion string
9597

9698
// Server settings
9799
Protocol Scheme
@@ -759,6 +761,7 @@ func loadFromConf(allowEmpty bool, extraConfig string) {
759761
}
760762

761763
AbsoluteAssetURL = MakeAbsoluteAssetURL(AppURL, StaticURLPrefix)
764+
AssetVersion = strings.ReplaceAll(AppVer, "+", "~") // make sure the version string is clear (no real escaping is needed)
762765

763766
manifestBytes := MakeManifestData(AppName, AppURL, AbsoluteAssetURL)
764767
ManifestData = `application/json;base64,` + base64.StdEncoding.EncodeToString(manifestBytes)

‎modules/templates/helper.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ func NewFuncMap() []template.FuncMap {
8181
"AppDomain": func() string {
8282
return setting.Domain
8383
},
84+
"AssetVersion": func() string {
85+
return setting.AssetVersion
86+
},
8487
"DisableGravatar": func() bool {
8588
return setting.DisableGravatar
8689
},
@@ -150,7 +153,6 @@ func NewFuncMap() []template.FuncMap {
150153
"DiffTypeToStr": DiffTypeToStr,
151154
"DiffLineTypeToStr": DiffLineTypeToStr,
152155
"ShortSha": base.ShortSha,
153-
"MD5": base.EncodeMD5,
154156
"ActionContent2Commits": ActionContent2Commits,
155157
"PathEscape": url.PathEscape,
156158
"PathEscapeSegments": util.PathEscapeSegments,

‎options/locale/locale_fr-FR.ini‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1209,6 +1209,8 @@ issues.filter_milestone=Jalon
12091209
issues.filter_milestone_no_select=Tous les jalons
12101210
issues.filter_assignee=Assigné
12111211
issues.filter_assginee_no_select=Toutes les affectations
1212+
issues.filter_poster=Auteur
1213+
issues.filter_poster_no_select=Tous les auteurs
12121214
issues.filter_type=Type
12131215
issues.filter_type.all_issues=Tous les tickets
12141216
issues.filter_type.assigned_to_you=Qui vous sont assignés
@@ -1267,7 +1269,7 @@ issues.ref_reopening_from=`<a href="%[3]s">a référencé une pull request %[4]s
12671269
issues.ref_closed_from=`<a href="%[3]s">a fermé ce ticket %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
12681270
issues.ref_reopened_from=`<a href="%[3]s">a réouvert ce ticket %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
12691271
issues.ref_from=`de %[1]s`
1270-
issues.poster=Publier
1272+
issues.poster=Éditeur
12711273
issues.collaborator=Collaborateur
12721274
issues.owner=Propriétaire
12731275
issues.re_request_review=Redemander la revue

0 commit comments

Comments
 (0)