Skip to content

Commit 6454a58

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: [skip ci] Updated licenses and gitignores Improve retrying index issues (go-gitea#27554) Replace more db.DefaultContext (go-gitea#27628) Fix 404 when there is an internal version of package (go-gitea#27615) [skip ci] Updated translations via Crowdin Add anchor to review types (go-gitea#26894) Update readme to remove drone svg (go-gitea#27624) Change the default branch in the agit docs (go-gitea#27621) Final round of `db.DefaultContext` refactor (go-gitea#27587) Fix permissions for Token DELETE endpoint to match GET and POST (go-gitea#27610) Enhanced auth token / remember me (go-gitea#27606) [skip ci] Updated translations via Crowdin rm outdated docs from some languages (go-gitea#27530) Upgrade go dependencies (go-gitea#27599) Fix build errors on BSD (in BSDMakefile) (go-gitea#27594) Enable shorthands in `declaration-strict-value` linter (go-gitea#27597) [skip ci] Updated translations via Crowdin Make disk clean action a bit more robust (go-gitea#27590)
2 parents b80e30c + d1f8552 commit 6454a58

File tree

202 files changed

+1138
-2780
lines changed

Some content is hidden

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

202 files changed

+1138
-2780
lines changed

.github/workflows/disk-clean.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@ jobs:
1212
- name: same as 'large-packages' but without 'google-cloud-sdk'
1313
shell: bash
1414
run: |
15-
sudo apt-get remove -y '^dotnet-.*'
16-
sudo apt-get remove -y '^llvm-.*'
17-
sudo apt-get remove -y 'php.*'
18-
sudo apt-get remove -y '^mongodb-.*'
19-
sudo apt-get remove -y '^mysql-.*'
20-
sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri
15+
sudo apt-get update
16+
sudo apt-get remove -y '^dotnet-.*' || true
17+
sudo apt-get remove -y '^llvm-.*' || true
18+
sudo apt-get remove -y 'php.*' || true
19+
sudo apt-get remove -y '^mongodb-.*' || true
20+
sudo apt-get remove -y '^mysql-.*' || true
21+
sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri || true
2122
sudo apt-get autoremove -y
2223
sudo apt-get clean
24+
env:
25+
DEBIAN_FRONTEND: noninteractive
2326
- name: Free Disk Space (Ubuntu)
2427
uses: jlumbroso/free-disk-space@main
2528
with:

.stylelintrc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ rules:
103103
property-no-vendor-prefix: null
104104
rule-empty-line-before: null
105105
rule-selector-property-disallowed-list: null
106-
scale-unlimited/declaration-strict-value: [[color, background-color, border-color, font-weight], {ignoreValues: /^(inherit|transparent|unset|initial|currentcolor|none)$/, ignoreFunctions: false, disableFix: true}]
106+
scale-unlimited/declaration-strict-value: [[/color$/, font-weight], {ignoreValues: /^(inherit|transparent|unset|initial|currentcolor|none)$/, ignoreFunctions: false, disableFix: true, expandShorthand: true}]
107107
selector-attribute-name-disallowed-list: null
108108
selector-attribute-operator-allowed-list: null
109109
selector-attribute-operator-disallowed-list: null

BSDmakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ GARGS = "--no-print-directory"
4242

4343
# The GNU convention is to use the lowercased `prefix` variable/macro to
4444
# specify the installation directory. Humor them.
45-
GPREFIX = ""
45+
GPREFIX =
4646
.if defined(PREFIX) && ! defined(prefix)
4747
GPREFIX = 'prefix = "$(PREFIX)"'
4848
.endif
4949

5050
.BEGIN: .SILENT
51-
which $(GMAKE) || printf "Error: GNU Make is required!\n\n" 1>&2 && false
51+
which $(GMAKE) || (printf "Error: GNU Make is required!\n\n" 1>&2 && false)
5252

5353
.PHONY: FRC
5454
$(.TARGETS): FRC

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<h1 align="center">Gitea - Git with a cup of tea</h1>
77

88
<p align="center">
9-
<a href="https://drone.gitea.io/go-gitea/gitea" title="Build Status">
10-
<img src="https://drone.gitea.io/api/badges/go-gitea/gitea/status.svg?ref=refs/heads/main">
9+
<a href="https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml?query=branch%3Amain" title="Release Nightly">
10+
<img src="https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml/badge.svg?branch=main">
1111
</a>
1212
<a href="https://discord.gg/Gitea" title="Join the Discord chat at https://discord.gg/Gitea">
1313
<img src="https://img.shields.io/discord/322538954119184384.svg">

README_ZH.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<h1 align="center">Gitea - Git with a cup of tea</h1>
77

88
<p align="center">
9-
<a href="https://drone.gitea.io/go-gitea/gitea" title="Build Status">
10-
<img src="https://drone.gitea.io/api/badges/go-gitea/gitea/status.svg?ref=refs/heads/main">
9+
<a href="https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml?query=branch%3Amain" title="Release Nightly">
10+
<img src="https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml/badge.svg?branch=main">
1111
</a>
1212
<a href="https://discord.gg/Gitea" title="Join the Discord chat at https://discord.gg/Gitea">
1313
<img src="https://img.shields.io/discord/322538954119184384.svg">

cmd/admin_auth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,5 +105,5 @@ func runDeleteAuth(c *cli.Context) error {
105105
return err
106106
}
107107

108-
return auth_service.DeleteSource(source)
108+
return auth_service.DeleteSource(ctx, source)
109109
}

contrib/fixtures/fixture_generation.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package main
66

77
import (
8+
"context"
89
"fmt"
910
"os"
1011
"path/filepath"
@@ -18,7 +19,7 @@ import (
1819

1920
var (
2021
generators = []struct {
21-
gen func() (string, error)
22+
gen func(ctx context.Context) (string, error)
2223
name string
2324
}{
2425
{
@@ -41,27 +42,28 @@ func main() {
4142
fmt.Printf("PrepareTestDatabase: %+v\n", err)
4243
os.Exit(1)
4344
}
45+
ctx := context.Background()
4446
if len(os.Args) == 0 {
4547
for _, r := range os.Args {
46-
if err := generate(r); err != nil {
48+
if err := generate(ctx, r); err != nil {
4749
fmt.Printf("generate '%s': %+v\n", r, err)
4850
os.Exit(1)
4951
}
5052
}
5153
} else {
5254
for _, g := range generators {
53-
if err := generate(g.name); err != nil {
55+
if err := generate(ctx, g.name); err != nil {
5456
fmt.Printf("generate '%s': %+v\n", g.name, err)
5557
os.Exit(1)
5658
}
5759
}
5860
}
5961
}
6062

61-
func generate(name string) error {
63+
func generate(ctx context.Context, name string) error {
6264
for _, g := range generators {
6365
if g.name == name {
64-
data, err := g.gen()
66+
data, err := g.gen(ctx)
6567
if err != nil {
6668
return err
6769
}

docs/content/administration.fr-fr.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

docs/content/administration.zh-tw.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

docs/content/administration/_index.zh-tw.md

Whitespace-only changes.

0 commit comments

Comments
 (0)