Skip to content

Commit 8f9b8c2

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: (29 commits) [skip ci] Updated translations via Crowdin Support localized README (go-gitea#20508) Clean up and fix clone button script (go-gitea#20415) Add disable download source configuration (go-gitea#20548) Fix default merge style (go-gitea#20564) Update login methods in package docs (go-gitea#20561) Add missing Tabs on organisation/package view (Frontport go-gitea#20539) (go-gitea#20540) [skip ci] Updated licenses and gitignores Add setting `SQLITE_JOURNAL_MODE` to enable WAL (go-gitea#20535) Rework file highlight rendering and fix yaml copy-paste (go-gitea#19967) Add new API endpoints for push mirrors management (go-gitea#19841) WebAuthn CredentialID field needs to be increased in size (go-gitea#20530) Add latest commit's SHA to content response (go-gitea#20398) Improve token and secret key generation docs (go-gitea#20387) [skip ci] Updated translations via Crowdin Rework raw file http header logic (go-gitea#20484) Update lunny/levelqueue to prevent NPE when reads are performed after close (go-gitea#20534) Added guidance on file to choose to download (go-gitea#20474) [skip ci] Updated translations via Crowdin Ensure that all unmerged files are merged when conflict checking (go-gitea#20528) ...
2 parents bddab98 + 1a8d7d0 commit 8f9b8c2

File tree

139 files changed

+3690
-797
lines changed

Some content is hidden

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

139 files changed

+3690
-797
lines changed

custom/conf/app.example.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ USER = root
313313
;DB_TYPE = sqlite3
314314
;PATH= ; defaults to data/gitea.db
315315
;SQLITE_TIMEOUT = ; Query timeout defaults to: 500
316+
;SQLITE_JOURNAL_MODE = ; defaults to sqlite database default (often DELETE), can be used to enable WAL mode. https://www.sqlite.org/pragma.html#pragma_journal_mode
316317
;;
317318
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
318319
;;
@@ -878,6 +879,9 @@ ROUTER = console
878879
;; Allow deletion of unadopted repositories
879880
;ALLOW_DELETION_OF_UNADOPTED_REPOSITORIES = false
880881

882+
;; Don't allow download source archive files from UI
883+
;DISABLE_DOWNLOAD_SOURCE_ARCHIVES = false
884+
881885
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
882886
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
883887
;[repository.editor]

docs/content/doc/advanced/config-cheat-sheet.en-us.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
7878
- `DEFAULT_BRANCH`: **main**: Default branch name of all repositories.
7979
- `ALLOW_ADOPTION_OF_UNADOPTED_REPOSITORIES`: **false**: Allow non-admin users to adopt unadopted repositories
8080
- `ALLOW_DELETION_OF_UNADOPTED_REPOSITORIES`: **false**: Allow non-admin users to delete unadopted repositories
81+
- `DISABLE_DOWNLOAD_SOURCE_ARCHIVES`: **false**: Don't allow download source archive files from UI
8182

8283
### Repository - Editor (`repository.editor`)
8384

@@ -382,6 +383,7 @@ The following configuration set `Content-Type: application/vnd.android.package-a
382383
- `verify-ca`: Enable TLS with verification of the database server certificate against its root certificate.
383384
- `verify-full`: Enable TLS and verify the database server name matches the given certificate in either the `Common Name` or `Subject Alternative Name` fields.
384385
- `SQLITE_TIMEOUT`: **500**: Query timeout for SQLite3 only.
386+
- `SQLITE_JOURNAL_MODE`: **""**: Change journal mode for SQlite3. Can be used to enable [WAL mode](https://www.sqlite.org/wal.html) when high load causes write congestion. See [SQlite3 docs](https://www.sqlite.org/pragma.html#pragma_journal_mode) for possible values. Defaults to the default for the database file, often DELETE.
385387
- `ITERATE_BUFFER_SIZE`: **50**: Internal buffer size for iterating.
386388
- `CHARSET`: **utf8mb4**: For MySQL only, either "utf8" or "utf8mb4". NOTICE: for "utf8mb4" you must use MySQL InnoDB > 5.6. Gitea is unable to check this.
387389
- `PATH`: **data/gitea.db**: For SQLite3 only, the database file path.

docs/content/doc/installation/from-binary.en-us.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,29 @@ embedded assets. This can be different for older releases.
2424

2525
## Download
2626

27-
Choose the file matching your platform from the [downloads page](https://dl.gitea.io/gitea/), copy the URL and replace the URL within the commands below:
27+
You can find the file matching your platform from the [downloads page](https://dl.gitea.io/gitea/) after navigating to the version you want to download.
28+
29+
### Choosing the right file
30+
31+
**For Linux**, you will likely want `linux-amd64`. It's for 64-bit Intel/AMD platforms, but there are other platforms available, including `arm64` (e.g. Raspberry PI 4), `386` (i.e. 32-bit), `arm-5`, and `arm-6`.
32+
33+
**For Windows**, you will likely want `windows-4.0-amd64`. It's for all modern versions of Windows, but there is also a `386` platform available designed for older, 32-bit versions of Windows.
34+
35+
*Note: there is also a `gogit-windows` file available that was created to help with some [performance problems](https://github.com/go-gitea/gitea/pull/15482) reported by some Windows users on older systems/versions. You should consider using this file if you're experiencing performance issues, and let us know if it improves performance.*
36+
37+
**For macOS**, you should choose `darwin-arm64` if your hardware uses Apple Silicon, or `darwin-amd64` for Intel.
38+
39+
### Downloading with wget
40+
41+
Copy the commands below and replace the URL within the one you wish to download.
2842

2943
```sh
3044
wget -O gitea https://dl.gitea.io/gitea/{{< version >}}/gitea-{{< version >}}-linux-amd64
3145
chmod +x gitea
3246
```
3347

48+
Note that the above command will download Gitea {{< version >}} for 64-bit Linux.
49+
3450
## Verify GPG signature
3551

3652
Gitea signs all binaries with a [GPG key](https://keys.openpgp.org/search?q=teabot%40gitea.io) to prevent against unwanted modification of binaries.

docs/content/doc/installation/with-docker.en-us.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,23 @@ services:
303303
- GITEA__mailer__PASSWD="""${GITEA__mailer__PASSWD:?GITEA__mailer__PASSWD not set}"""
304304
```
305305

306-
To set required TOKEN and SECRET values, consider using Gitea's built-in [generate utility functions](https://docs.gitea.io/en-us/command-line/#generate).
306+
Gitea will generate new secrets/tokens for every new installation automatically and write them into the app.ini. If you want to set the secrets/tokens manually, you can use the following docker commands to use of Gitea's built-in [generate utility functions](https://docs.gitea.io/en-us/command-line/#generate). Do not lose/change your SECRET_KEY after the installation, otherwise the encrypted data can not be decrypted anymore.
307+
308+
The following commands will output a new `SECRET_KEY` and `INTERNAL_TOKEN` to `stdout`, which you can then place in your environment variables.
309+
310+
```bash
311+
docker run -it --rm gitea/gitea:1 gitea generate secret SECRET_KEY
312+
docker run -it --rm gitea/gitea:1 gitea generate secret INTERNAL_TOKEN
313+
```
314+
315+
```yaml
316+
...
317+
services:
318+
server:
319+
environment:
320+
- GITEA__security__SECRET_KEY=[value returned by generate secret SECRET_KEY]
321+
- GITEA__security__INTERNAL_TOKEN=[value returned by generate secret INTERNAL_TOKEN]
322+
```
307323
308324
## SSH Container Passthrough
309325

docs/content/doc/packages/composer.en-us.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ curl --user your_username:your_password_or_token \
6060
https://gitea.example.com/api/packages/testuser/composer?version=1.0.3
6161
```
6262

63+
If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password.
64+
6365
The server responds with the following HTTP Status codes.
6466

6567
| HTTP Status Code | Meaning |

docs/content/doc/packages/conan.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ conan user --remote {remote} --password {password} {username}
3737
| -----------| ----------- |
3838
| `remote` | The remote name. |
3939
| `username` | Your Gitea username. |
40-
| `password` | Your Gitea password or a personal access token. |
40+
| `password` | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password. |
4141
| `owner` | The owner of the package. |
4242

4343
For example:

docs/content/doc/packages/container.en-us.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ To push an image or if the image is in a private registry, you have to authentic
3434
docker login gitea.example.com
3535
```
3636

37+
If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password.
38+
3739
## Image naming convention
3840

3941
Images must follow this naming convention:

docs/content/doc/packages/generic.en-us.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ PUT https://gitea.example.com/api/packages/{owner}/generic/{package_name}/{packa
3737
| ----------------- | ----------- |
3838
| `owner` | The owner of the package. |
3939
| `package_name` | The package name. It can contain only lowercase letters (`a-z`), uppercase letter (`A-Z`), numbers (`0-9`), dots (`.`), hyphens (`-`), or underscores (`_`). |
40-
| `package_version` | The package version as described in the [SemVer](https://semver.org/) spec. |
40+
| `package_version` | The package version, a non-empty string. |
4141
| `file_name` | The filename. It can contain only lowercase letters (`a-z`), uppercase letter (`A-Z`), numbers (`0-9`), dots (`.`), hyphens (`-`), or underscores (`_`). |
4242

4343
Example request using HTTP Basic authentication:
@@ -48,6 +48,8 @@ curl --user your_username:your_password_or_token \
4848
https://gitea.example.com/api/packages/testuser/generic/test_package/1.0.0/file.bin
4949
```
5050

51+
If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password.
52+
5153
The server reponds with the following HTTP Status codes.
5254

5355
| HTTP Status Code | Meaning |

docs/content/doc/packages/helm.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ helm cm-push ./{chart_file}.tgz {repo}
4242
| Parameter | Description |
4343
| ------------ | ----------- |
4444
| `username` | Your Gitea username. |
45-
| `password` | Your Gitea password or a personal access token. |
45+
| `password` | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password. |
4646
| `repo` | The name for the repository. |
4747
| `chart_file` | The Helm Chart archive. |
4848
| `owner` | The owner of the package. |

docs/content/doc/packages/nuget.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dotnet nuget add source --name {source_name} --username {username} --password {p
3838
| ------------- | ----------- |
3939
| `source_name` | The desired source name. |
4040
| `username` | Your Gitea username. |
41-
| `password` | Your Gitea password or a personal access token. |
41+
| `password` | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password. |
4242
| `owner` | The owner of the package. |
4343

4444
For example:

0 commit comments

Comments
 (0)