Skip to content

Commit ff60376

Browse files
committed
Merge branch 'main' into add-issue-planned-time
2 parents 52d62fb + fb7b743 commit ff60376

File tree

302 files changed

+4659
-2032
lines changed

Some content is hidden

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

302 files changed

+4659
-2032
lines changed

.devcontainer/devcontainer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
"ms-azuretools.vscode-docker",
2727
"vitest.explorer",
2828
"qwtel.sqlite-viewer",
29-
"GitHub.vscode-pull-request-github"
29+
"GitHub.vscode-pull-request-github",
30+
"Azurite.azurite"
3031
]
3132
}
3233
},

.gitea/issue_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!--
44
1. Please speak English, this is the language all maintainers can speak and write.
55
2. Please ask questions or configuration/deploy problems on our Discord
6-
server (https://discord.gg/gitea) or forum (https://discourse.gitea.io).
6+
server (https://discord.gg/gitea) or forum (https://forum.gitea.com).
77
3. Please take a moment to check that your issue doesn't already exist.
88
4. Make sure it's not mentioned in the FAQ (https://docs.gitea.com/help/faq)
99
5. Please give all relevant information below for bug reports, because
@@ -21,7 +21,7 @@
2121
- [ ] MySQL
2222
- [ ] MSSQL
2323
- [ ] SQLite
24-
- Can you reproduce the bug at https://try.gitea.io:
24+
- Can you reproduce the bug at https://demo.gitea.com:
2525
- [ ] Yes (provide example URL)
2626
- [ ] No
2727
- Log gist:

.github/ISSUE_TEMPLATE/bug-report.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ body:
3737
label: Can you reproduce the bug on the Gitea demo site?
3838
description: |
3939
If so, please provide a URL in the Description field
40-
URL of Gitea demo: https://try.gitea.io
40+
URL of Gitea demo: https://demo.gitea.com
4141
options:
4242
- "Yes"
4343
- "No"
@@ -74,7 +74,7 @@ body:
7474
attributes:
7575
label: How are you running Gitea?
7676
description: |
77-
Please include information on whether you built Gitea yourself, used one of our downloads, are using https://try.gitea.io or are using some other package
77+
Please include information on whether you built Gitea yourself, used one of our downloads, are using https://demo.gitea.com or are using some other package
7878
Please also tell us how you are running Gitea, e.g. if it is being run from docker, a command-line, systemd etc.
7979
If you are using a package or systemd tell us what distribution you are using
8080
validations:

.github/ISSUE_TEMPLATE/ui.bug-report.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ body:
4646
label: Can you reproduce the bug on the Gitea demo site?
4747
description: |
4848
If so, please provide a URL in the Description field
49-
URL of Gitea demo: https://try.gitea.io
49+
URL of Gitea demo: https://demo.gitea.com
5050
options:
5151
- "Yes"
5252
- "No"

.github/workflows/pull-db-tests.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,18 @@ jobs:
119119
MINIO_SECRET_KEY: 12345678
120120
ports:
121121
- "9000:9000"
122+
devstoreaccount1.azurite.local: # https://github.com/Azure/Azurite/issues/1583
123+
image: mcr.microsoft.com/azure-storage/azurite:latest
124+
ports:
125+
- 10000:10000
122126
steps:
123127
- uses: actions/checkout@v4
124128
- uses: actions/setup-go@v5
125129
with:
126130
go-version-file: go.mod
127131
check-latest: true
128132
- name: Add hosts to /etc/hosts
129-
run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 mysql elasticsearch meilisearch smtpimap" | sudo tee -a /etc/hosts'
133+
run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 minio devstoreaccount1.azurite.local mysql elasticsearch meilisearch smtpimap" | sudo tee -a /etc/hosts'
130134
- run: make deps-backend
131135
- run: make backend
132136
env:
@@ -204,14 +208,18 @@ jobs:
204208
SA_PASSWORD: MwantsaSecurePassword1
205209
ports:
206210
- "1433:1433"
211+
devstoreaccount1.azurite.local: # https://github.com/Azure/Azurite/issues/1583
212+
image: mcr.microsoft.com/azure-storage/azurite:latest
213+
ports:
214+
- 10000:10000
207215
steps:
208216
- uses: actions/checkout@v4
209217
- uses: actions/setup-go@v5
210218
with:
211219
go-version-file: go.mod
212220
check-latest: true
213221
- name: Add hosts to /etc/hosts
214-
run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 mssql" | sudo tee -a /etc/hosts'
222+
run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 mssql devstoreaccount1.azurite.local" | sudo tee -a /etc/hosts'
215223
- run: make deps-backend
216224
- run: make backend
217225
env:

.github/workflows/release-nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
run: |
4848
REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
4949
echo "Cleaned name is ${REF_NAME}"
50-
echo "branch=${REF_NAME}" >> "$GITHUB_OUTPUT"
50+
echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT"
5151
- name: configure aws
5252
uses: aws-actions/configure-aws-credentials@v4
5353
with:

.golangci.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ run:
2929

3030
output:
3131
sort-results: true
32+
sort-order: [file]
33+
show-stats: true
3234

3335
linters-settings:
3436
stylecheck:
@@ -40,11 +42,7 @@ linters-settings:
4042
- ifElseChain
4143
- singleCaseSwitch # Every time this occurred in the code, there was no other way.
4244
revive:
43-
ignore-generated-header: false
44-
severity: warning
45-
confidence: 0.8
46-
errorCode: 1
47-
warningCode: 1
45+
severity: error
4846
rules:
4947
- name: atomic
5048
- name: bare-return

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ If your issue has not been reported yet, [open an issue](https://github.com/go-g
7777
and answer the questions so we can understand and reproduce the problematic behavior. \
7878
Please write clear and concise instructions so that we can reproduce the behavior — even if it seems obvious. \
7979
The more detailed and specific you are, the faster we can fix the issue. \
80-
It is really helpful if you can reproduce your problem on a site running on the latest commits, i.e. <https://try.gitea.io>, as perhaps your problem has already been fixed on a current version. \
80+
It is really helpful if you can reproduce your problem on a site running on the latest commits, i.e. <https://demo.gitea.com>, as perhaps your problem has already been fixed on a current version. \
8181
Please follow the guidelines described in [How to Report Bugs Effectively](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html) for your report.
8282

8383
Please be kind, remember that Gitea comes at no cost to you, and you're getting free help.
@@ -362,7 +362,7 @@ If you add a new feature or change an existing aspect of Gitea, the documentatio
362362

363363
## API v1
364364

365-
The API is documented by [swagger](http://try.gitea.io/api/swagger) and is based on [the GitHub API](https://docs.github.com/en/rest).
365+
The API is documented by [swagger](https://gitea.com/api/swagger) and is based on [the GitHub API](https://docs.github.com/en/rest).
366366

367367
### GitHub API compatibility
368368

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build stage
2-
FROM docker.io/library/golang:1.22-alpine3.19 AS build-env
2+
FROM docker.io/library/golang:1.22-alpine3.20 AS build-env
33

44
ARG GOPROXY
55
ENV GOPROXY ${GOPROXY:-direct}
@@ -41,7 +41,7 @@ RUN chmod 755 /tmp/local/usr/bin/entrypoint \
4141
/go/src/code.gitea.io/gitea/environment-to-ini
4242
RUN chmod 644 /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete
4343

44-
FROM docker.io/library/alpine:3.19
44+
FROM docker.io/library/alpine:3.20
4545
LABEL maintainer="[email protected]"
4646

4747
EXPOSE 22 3000

Dockerfile.rootless

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build stage
2-
FROM docker.io/library/golang:1.22-alpine3.19 AS build-env
2+
FROM docker.io/library/golang:1.22-alpine3.20 AS build-env
33

44
ARG GOPROXY
55
ENV GOPROXY ${GOPROXY:-direct}
@@ -39,7 +39,7 @@ RUN chmod 755 /tmp/local/usr/local/bin/docker-entrypoint.sh \
3939
/go/src/code.gitea.io/gitea/environment-to-ini
4040
RUN chmod 644 /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete
4141

42-
FROM docker.io/library/alpine:3.19
42+
FROM docker.io/library/alpine:3.20
4343
LABEL maintainer="[email protected]"
4444

4545
EXPOSE 2222 3000

0 commit comments

Comments
 (0)