Commit graph

14972 commits

Author SHA1 Message Date
sillyguodong
ba2c902092
Add chinese documentations for installation (#24904) (#25015)
backport #24904

(cherry picked from commit 3b5cc02345)
2023-06-05 15:44:19 +02:00
HesterG
3f4a67eef8
Add Chinese docs for help, contribution and development (#24925) (#25011)
Backport #24925, partially backport #24934
(`docs/content/doc/help/faq.zh-cn.md` file)

Part of backport has already done by #24942

Also backport #24881 to avoid "deadlock"

---------

Co-authored-by: Zettat123 <zettat123@gmail.com>
(cherry picked from commit 37b73b3337)
2023-06-05 15:44:19 +02:00
HesterG
35c503f1ca
Unify doc links to use paths relative to doc folder (#24979) (#25000)
Backport #24979

Changes:

1. Use uniform links types relative to doc folder (start with `doc/`)
2. According to [docusaurus
links](https://docusaurus.io/docs/markdown-features/links), if `<a>` is
used, the `href` is resolved as URL location, but not file location. So
need to use `[text]({{< relref "path" >}})` instead.

(cherry picked from commit d2c9fb02dd)
2023-06-05 15:44:19 +02:00
HesterG
442a13b98a
Remove unnecessary content on docs (#24976) (#25001)
Backport #24976

(cherry picked from commit cdeb55f6e5)
2023-06-05 15:44:19 +02:00
Giteabot
18b1ae2e72
Update from-binary.en-us.md (#24975) (#24999)
Backport #24975 by @team-epk

Fixed link to the creating a systemd service in Ubuntu document.

(cherry picked from commit 0ef7b66018)
2023-06-05 15:44:19 +02:00
sillyguodong
58bdcae613
Fix missing reference prefix of commits when sync mirror repository (#24994)
replace #24868
just a patch to fix #24824 in v1.19.4
The reference name of commits when synchronizing should also has prefix
like refs/heads/<branch-name>.

(cherry picked from commit 826b7b979c)
2023-05-30 08:11:45 +02:00
Amos (LFlare) Ng
8d4d6f9b22
Match unqualified references when syncing pulls as well (#23070)
It seems that `opts.RefFullName` may occassionally be set
to just the branch name, without the `refs/heads/` prefixing.

(cherry picked from commit 7dc46ffbaa)
2023-05-30 08:11:45 +02:00
Giteabot
7f3cc1446a
zh-cn translation for usage docs (#24897) (#24977)
Backport #24897 by @Zettat123

- [x] agit-support
- [x] clone-filter
- [x] incoming-email
- [x] labels
- [x] linked-references
- [x] merge-message-templates
- [x] permissions
- [x] profile-readme
- [x] protected-tags
- [x] push
- [x] repo-mirror
- [x] secrets
- [x] template-repositories
- [x] webhooks

Co-authored-by: Zettat123 <zettat123@gmail.com>
(cherry picked from commit 3a7e0953c1)
2023-05-30 08:11:45 +02:00
Giteabot
9cabf76a09
simple docs fixes: 'pull request' page (en-us & zh-tw) link path to 'issue-pull-request-templates' (#24961) (#24970)
Backport #24961 by @jonkeim

Co-authored-by: Jon Keim <jon@windless.org>
Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit 9da84a36eb)
2023-05-30 08:11:45 +02:00
Giteabot
6f76c659ea
Remove reference to caddy v1 in docs (#24962) (#24964)
Backport #24962 by @techknowlogick

caddy v1 is loong eol. v2 should be used.

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
(cherry picked from commit 8a6a1143a4)
2023-05-30 08:11:45 +02:00
HesterG
7f45886f05
Fix doc for 1.19 backend guideline (#24942)
Port the file change in
https://github.com/go-gitea/gitea/pull/24925/files from `main` to
`v1.19` to fix docs

(cherry picked from commit b4cd1028d9)
2023-05-30 08:11:45 +02:00
Giteabot
788ffdb328
Merge two translation contributing documents (#23939) (#24933)
Backport #23939 by @lunny

This PR also adjusts the weights.

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: delvh <dev.lh@web.de>
(cherry picked from commit d1af0a3e4c)
2023-05-30 08:11:45 +02:00
wxiaoguang
6d3b3af57d
Merge different languages for language stats (#24900) (#24921)
Backport #24900

Fix #24896

If users set different languages by `linguist-language`, the `stats` map
could be: `java: 100, Java: 200`.

Language stats are stored as case-insensitive in database and there is a
unique key.

So, the different language names should be merged to one unique name:
`Java: 300`

(cherry picked from commit a83d597989)
2023-05-30 08:11:45 +02:00
Paweł Bogusławski
5fdac0d46a
Hiding Secrets options when Actions feature is disabled (#24792)
`Secrets` options should be hidden if `Actions` feature is disabled.

This fixes in release/v1.19. In main probably fixed in
63a401ac40 (didn't check).

Fixes: 659055138b
Author-Change-Id: IB#1134011

Signed-off-by: Pawel Boguslawski <pawel.boguslawski@ib.pl>
(cherry picked from commit c5dee8823c)
2023-05-30 08:11:45 +02:00
Giteabot
75122edc97
Only validate changed columns when update user (#24867) (#24903)
Backport #24867 by @lunny

Fix #23211
Replace #23496

---------

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
(cherry picked from commit 275abd6593)
2023-05-30 08:11:45 +02:00
wxiaoguang
936eb64ebf
Make DeleteIssue use correct context (#24885)
Fix #24884 , the `ctx.Repo.GitRepo` might be nil.

(cherry picked from commit d19d5bc5b8)
2023-05-30 08:11:44 +02:00
Lunny Xiao
a28fd056e5
Remove unnecessary prefix usage (#24888)
Since now all articles have a class, the `Usage:` is unnecessary. This
PR will remove them.

(cherry picked from commit e7757aa4be)
2023-05-30 08:11:44 +02:00
Earl Warren
24b6efc2fb
Revert "[API] fix deleting an issue when the git repo does not exist"
replaced by d00af6130 Remove unnecessary prefix usage (#24888)

This reverts commit 985e378272.
2023-05-30 08:10:44 +02:00
silverwind
a1776ee351
Set --font-weight-bold to 600 (#24840)
Backport of https://github.com/go-gitea/gitea/pull/24827 to 1.19, just
the font weight reduction.

(cherry picked from commit e81d38b0f6)
2023-05-23 07:42:34 +02:00
Giteabot
16bcceeff7
Return 404 in the API if the requested webhooks were not found (#24823) (#24830)
Backport #24823 by @sonjek

Should resolve first point of the issue
https://github.com/go-gitea/gitea/issues/24574

Co-authored-by: Yevhen Pavlov <yevhen.pavlov.ua@gmail.com>
(cherry picked from commit f29c52a169)
2023-05-23 07:42:34 +02:00
Giteabot
5dc29fdeb1
Fix topics deleted via API not being deleted in org page (#24825) (#24829)
Backport #24825 by @yardenshoham

The topics are saved in the repo_topic table with a repoID key. They are
also saved directly in the repository table.

Before this PR, only `AddTopic` and `SaveTopics` made sure the `topics`
field in the repository field was synced with the repo_topic table.

This PR makes sure `GenerateTopics` and `DeleteTopic` also sync the
`topics` in the repository table.

`RemoveTopicsFromRepo` doesn't need to sync the data as it is only used
to delete a repository.

- Fixes #24820

(cherry picked from commit 04f9ab1aa9)
2023-05-23 07:42:34 +02:00
Giteabot
88bde31515
Fix Actions being enabled accidentally (#24802) (#24810)
Backport #24802 by @wolfogre

Regression of #24536. If the user doesn't explicitly disable Actions, it
will be enabled.

1. Gitea will call `loadRepositoryFrom` before `loadActionsFrom`.

25d4f95df2/modules/setting/setting.go (L234-L237)
2. In `loadRepositoryFrom`,
`rootCfg.Section("actions").Key("ENABLED").MustBool(true)` will set
`actions.ENABLED` with `true`.

25d4f95df2/modules/setting/repository.go (L313-L315)
3. In `loadActionsFrom`, `rootCfg.Section("actions")` will get a section
with Actions enabled.

25d4f95df2/modules/setting/actions.go (L23-L26)

Although the cause of the problem was using `true` by copy-paste
mistake, it also surprised me that
**`rootCfg.Section("actions").Key("ENABLED").MustBool(true)` doesn't
only read, but also write.**

Co-authored-by: Jason Song <i@wolfogre.com>
(cherry picked from commit b369ed579d)
2023-05-23 07:42:34 +02:00
wxiaoguang
9bc4887cb7
Fix safari cookie session bug (#24772)
Partically backport #24330

Related: #24176

Maybe fix #24770

(cherry picked from commit 64cc691b7f)
2023-05-23 07:42:34 +02:00
Giteabot
b261f44478
Fix missed table name on iterate lfs meta objects (#24768) (#24774)
Backport #24768 by @lunny

Fix #24763

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
(cherry picked from commit 1bad05da3d)
2023-05-23 07:42:34 +02:00
Giteabot
9cf864c36d
Make mailer SMTP check have timed context (#24751) (#24759)
Backport #24751 by @wxiaoguang

Make mailer SMTP check have timed context

Otherwise Gitea may block for long time if the DNS request blocks.

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 57f520e7e5)
2023-05-23 07:42:34 +02:00
Giteabot
f6919e3e53
Respect original content when creating secrets (#24745) (#24746)
Backport #24745 by @wolfogre

Fix #24721.

Follow what GitHub does:
- Don't trim spaces for secrets.
- Newline should be `\n` instead of `\r\n`.

Did some tests with:

```yaml
name: secrets
on: push
jobs:
  show_secrets:
    runs-on: ubuntu-latest
    steps:
      - name: Dump secrets context
        run: echo '${{ toJSON(secrets) }}' | base64
```

`AAAAAA`:
```text
   AAAAAA
AAAAAA

```
`BBBBBB`:
```text

BBBBBB
BBBBBB
```

On GitHub:

<img width="675" alt="image"
src="https://github.com/go-gitea/gitea/assets/9418365/0ec60652-c2a3-47bb-9f9d-7e81665355a8">

On Gitea (before):

<img width="673" alt="image"
src="https://github.com/go-gitea/gitea/assets/9418365/cce818bf-5edc-4656-86e1-2c81c304cdb2">

On Gitea (after):

<img width="673" alt="image"
src="https://github.com/go-gitea/gitea/assets/9418365/0b3b15af-4d48-4bab-a334-4738a1b0eb4a">

Co-authored-by: Jason Song <i@wolfogre.com>
(cherry picked from commit e4f200e616)
2023-05-23 07:42:33 +02:00
wxiaoguang
f37fba567a
Fix Pull Mirror out-of-sync bugs (#24732) (#24733)
Backport #24732

Bug-fix only

(cherry picked from commit 6ecd2e782f)
2023-05-16 07:42:23 +02:00
Giteabot
f9bf040a5a
Fix run list broken when trigger user deleted (#24706) (#24709)
Backport #24706 by @lunny

Fix #24682

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
(cherry picked from commit 2fea93b2d3)
2023-05-16 07:42:23 +02:00
Giteabot
e12f550fed
Add test for api team organization (#24699) (#24702)
Backport #24699 by @lunny

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
(cherry picked from commit 0ee51a5221)
2023-05-16 07:42:23 +02:00
Giteabot
bfa368adbe
Fix organization field being null in GET /api/v1/teams/{id} (#24694) (#24696)
Backport #24694 by @yardenshoham

Enabled the organization loading flag.

- Fixes #20399

# Before
```json
{
  ...
  "description": "",
  "organization": null,
  "includes_all_repositories": true,
  "permission": "owner",
  ...
}
```

# After
```json
{
  ...
  "description": "",
  "organization": {
    "id": 2,
    "name": "bigorg",
    "full_name": "",
    "avatar_url": "https://3000-yardenshoham-gitea-3gfrlc9gn4h.ws-us96b.gitpod.io/avatars/e2649b0c016d9102664a7d4349503eb9",
    "description": "",
    "website": "",
    "location": "",
    "visibility": "public",
    "repo_admin_change_team_access": true,
    "username": "bigorg"
  },
  "includes_all_repositories": true,
  "permission": "owner",
  ...
}
```

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
Co-authored-by: Yarden Shoham <git@yardenshoham.com>
(cherry picked from commit da1c38dd47)
2023-05-16 07:42:22 +02:00
Giteabot
5df83525da
Fix docs documenting invalid @every for OLDER_THAN cron settings (#24695) (#24698)
Backport #24695 by @yardenshoham

Looks like a copy-paste leftover

- Fixes #20868

Co-authored-by: Yarden Shoham <git@yardenshoham.com>
(cherry picked from commit aa984f21fa)
2023-05-16 07:42:22 +02:00
Giteabot
55d062003c
Fix issues list page multiple selection update milestones (#24660) (#24663)
Backport #24660 by @lunny

Fix #24651

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
(cherry picked from commit 8f722012f6)
2023-05-16 07:42:22 +02:00
oliverpool
937b8e8184
fix: release page for empty or non-existing target (#24659)
Backport #24470

Fixes #24145

---

To solve the bug, I added a "computed" `TargetBehind` field to the
`Release` model, which indicates the target branch of a release. This is
particularly useful if the target branch was deleted in the meantime (or
is empty).

I also did a micro-optimization in `calReleaseNumCommitsBehind`. Instead
of checking that a branch exists and then call `GetBranchCommit`, I
immediately call `GetBranchCommit` and handle the `git.ErrNotExist`
error.

This optimization is covered by the added unit test.

_contributed in the context of @forgejo_

(cherry picked from commit cb7ba8969d)
2023-05-16 07:42:22 +02:00
Earl Warren
3e8f99287a
Merge remote-tracking branch 'forgejo/v1.19/forgejo-i18n' into v1.19/forgejo 2023-05-10 18:53:07 +02:00
Earl Warren
b2289c52f9
Merge remote-tracking branch 'forgejo/v1.19/forgejo-branding' into v1.19/forgejo 2023-05-10 18:53:01 +02:00
Caesar Schinas
82cd82d89f
[BRANDING] Rebrand footer "powered by" links
(cherry picked from commit 8b9237e47e)
(cherry picked from commit 47e5543f33)
(cherry picked from commit 456abff8c0)
(cherry picked from commit 2d2588187e)
(cherry picked from commit f4a4975333)
(cherry picked from commit 4d116d61df)
(cherry picked from commit dcc054471e)
(cherry picked from commit 5146f47867)
(cherry picked from commit 7ffe74685a)
2023-05-10 11:05:22 +02:00
lauralani
84c20b03b0
[BRANDING] adapt forgejo/contrib/upgrade.sh
Reviewed at: https://codeberg.org/forgejo/forgejo/pulls/605

(cherry picked from commit fb14bcd800)
(cherry picked from commit f9d9edb118)
(cherry picked from commit 2831912fc0)
(cherry picked from commit 2109f6c9ab)
2023-05-10 11:05:22 +02:00
Earl Warren
a87134db20
[BRANDING] Add Forgejo light, dark, and auto themes: fix import
Closes: https://codeberg.org/forgejo/forgejo/issues/562
(cherry picked from commit 2b0dc1f80f)
(cherry picked from commit 690dde103f)
(cherry picked from commit 1443ea4620)
(cherry picked from commit 39de9bda2a)
(cherry picked from commit 0c20477a75)
(cherry picked from commit 8b99f9860c)
2023-05-10 11:05:22 +02:00
Earl Warren
924eaa55ce
[BRANDING] link to forgejo.org/docs instead of docs.gitea.io
Fix the link that was 404.

(cherry picked from commit ae515d7258)
(cherry picked from commit 48c59093cd)
(cherry picked from commit 8d4b1804bd)
(cherry picked from commit b7555a2905)
(cherry picked from commit 18c6892b86)
(cherry picked from commit c71a25615c)
(cherry picked from commit 3937bc7450)
2023-05-10 11:05:22 +02:00
Rychart Redwerkz
996d38723e
[BRANDING] Rebrand dump log
(cherry picked from commit b92a65a23f)
(cherry picked from commit d77b4e486d)
(cherry picked from commit cd94894a0d)
(cherry picked from commit b82f351c90)
(cherry picked from commit f3ff341d23)
(cherry picked from commit db55136898)
(cherry picked from commit 00cfc783a9)
2023-05-10 11:05:22 +02:00
Loïc Dachary
480f8528f3
[BRANDING] X-Forgejo-OTP can be used instead of X-Gitea-OTP
(cherry picked from commit 7b0549cd70)
(cherry picked from commit 13e10a65d9)
(cherry picked from commit 89982e6c4a)
(cherry picked from commit a4acf6343d)
(cherry picked from commit 9886aec9f8)
(cherry picked from commit 1ee9bd7549)
(cherry picked from commit f343cf5597)
(cherry picked from commit eaca81faf4)
2023-05-10 11:05:22 +02:00
Earl Warren
a83a971cdf
[BRANDING] link to forgejo.org/docs instead of docs.gitea.io
(cherry picked from commit 3efafd0e08)
(cherry picked from commit 148185e34b)
(cherry picked from commit 977920fbc7)
(cherry picked from commit b2f37f092f)
(cherry picked from commit 3bcba19f55)
(cherry picked from commit bb553b31e7)
(cherry picked from commit fe9443b399)
(cherry picked from commit 0545142833)
2023-05-10 11:05:22 +02:00
Loïc Dachary
086c14c75d
[BRANDING] alias {FORGEJO,GITEA}_{CUSTOM,WORK_DIR}
FORGEJO_* environment variables are set to the corresponding GITEA_*
variable when the cli starts. This approach is intended to minimize
the conflicts on rebase. All occurences of GITEA_* are left untouched
in the codebase and they are only changed to FORGEJO_* if exposed to
the user.

(cherry picked from commit e466f9d10e)
(cherry picked from commit e33e95931b)
(cherry picked from commit 5f528f0a25)
(cherry picked from commit 65146bfbcd)
(cherry picked from commit 393eede84a)
(cherry picked from commit df68ae9d1f)
(cherry picked from commit 2f05b0cc1f)
(cherry picked from commit 71d2c21c81)
2023-05-10 11:05:22 +02:00
Loïc Dachary
775b0fb721
[BRANDING] symlink gitea to forgejo in docker containers
(cherry picked from commit 9c06a318b8)
(cherry picked from commit 95859da3b4)
(cherry picked from commit e3a5f6c1ed)
(cherry picked from commit e441e9a5c7)
(cherry picked from commit c37daa897a)
(cherry picked from commit 682c695299)
(cherry picked from commit b8a34a927b)
(cherry picked from commit ec560da539)
(cherry picked from commit 9da7c9bf41)
2023-05-10 11:05:22 +02:00
Loïc Dachary
410bbfed7f
[BRANDING] lookup .forgejo/workflows before .gitea/workflows
(cherry picked from commit ffe51fd72f)
(cherry picked from commit a2b483b67d)
(cherry picked from commit 2b7d0bbde2)
(cherry picked from commit 4a6141187d)
(cherry picked from commit a3ccc97ef8)
(cherry picked from commit 6259e5b9a2)
(cherry picked from commit 8a293ff204)
(cherry picked from commit 83c9145c08)
(cherry picked from commit 6b69212404)
2023-05-10 11:05:22 +02:00
Earl Warren
412a9dbc15
[BRANDING] DEFAULT_ACTIONS_URL = https://codeberg.org
(cherry picked from commit 52b364ddbd)
(cherry picked from commit 99887cd567)
(cherry picked from commit cd5788782a)

Conflicts:
	docs/content/doc/advanced/config-cheat-sheet.en-us.md
(cherry picked from commit f33e7c8f5a)
(cherry picked from commit dc892c2e80)
(cherry picked from commit 60f53af40c)
(cherry picked from commit dbf7401fe8)
(cherry picked from commit d89cf82796)
(cherry picked from commit d0b3dfd423)
2023-05-10 11:05:22 +02:00
Loïc Dachary
7124cfa37a
[BRANDING] reserve forgejo-actions username
(cherry picked from commit 2a25be788b)
(cherry picked from commit b270d5815c)
(cherry picked from commit e7382cc71e)
(cherry picked from commit 665400ea1e)
(cherry picked from commit af17f5caf7)
(cherry picked from commit b238a8463a)
(cherry picked from commit 81c71941ad)
(cherry picked from commit 48979314b1)
(cherry picked from commit 9fc2cef94a)
(cherry picked from commit 14cb04148a)
2023-05-10 11:05:22 +02:00
Gusted
ae2839938e
[BRANDING] Update nodeinfo branding
- Change the values for the nodeinfo API, to use branded values.
- Resolves https://codeberg.org/forgejo/forgejo/issues/257

(cherry picked from commit 4608c57688)
(cherry picked from commit e837e8a529)
(cherry picked from commit 6601328d3c)
(cherry picked from commit c6be21d487)
(cherry picked from commit 692ccd03a9)
(cherry picked from commit 4976b1a4f3)
(cherry picked from commit ddb2d26b0d)

Conflicts:
	tests/integration/api_nodeinfo_test.go
(cherry picked from commit ff960a78d8)
(cherry picked from commit 5200b186c7)
(cherry picked from commit 5c97ae00e6)
2023-05-10 11:05:22 +02:00
Earl Warren
4b4aeff24b
[BRANDING] define the forgejo webhook type
templates/swagger/v1_json.tmpl updated with `make generate-swagger`

(cherry picked from commit 88899c492e)
(cherry picked from commit 7171bd9617)
(cherry picked from commit 1a742446c1)
(cherry picked from commit 132342ae8d)
(cherry picked from commit b47b815fbe)
(cherry picked from commit 2dbb52c8ec)
(cherry picked from commit c846de4322)
(cherry picked from commit c3d1ad7bbc)
(cherry picked from commit 972c772c0e)
2023-05-10 11:05:22 +02:00
Earl Warren
ac0f33925d
[BRANDING] add X-Forgejo-* headers
(cherry picked from commit 0a3388f93f)
(cherry picked from commit 7eba0a440a)
(cherry picked from commit eb9646c7ef)
(cherry picked from commit f1972578f5)

Conflicts:
(cherry picked from commit 3d72f6b3ac)
(cherry picked from commit 6a94f830c0)
(cherry picked from commit 522a09dbc1)
(cherry picked from commit 471ad9f728)
(cherry picked from commit a27221e653)
(cherry picked from commit 747f423125)
2023-05-10 11:05:22 +02:00