mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-10-31 06:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity
22,481 commits 22 branches 265 tags 223 MiB
Commit graph

22,481 commits

This branch
This branch
All branches
Author SHA1 Message Date
Renovate Bot
85717dcdd8 Update dependency webpack-cli to v6 2024-12-24 20:05:17 +00:00
Renovate Bot
2a0fad33d6 Update github.com/shurcooL/vfsgen digest to 0000e14 2024-12-24 20:03:41 +00:00
Gusted
e2d3518f04 Merge pull request 'Update dependency idiomorph to v0.4.0 (forgejo)' (#6355) from renovate/forgejo-idiomorph-0.x into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6355
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-12-24 19:20:13 +00:00
Earl Warren
d96ba346d2 Merge pull request 'chore: remove unused dependency from build.go' (#6310) from gusted/forgejo-build-file into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6310
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-12-24 12:38:31 +00:00
Earl Warren
ec20eaee44 Merge pull request 'fix: avoid Gitea migration warnings' (#6343) from earl-warren/forgejo:wip-gitea-migration into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6343
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-12-24 09:38:33 +00:00
Earl Warren
9524d6d430
 		fix: keying SQLite migration 
Also run the keying migration when upgrading from Gitea.

Add type change support for SQLite field from TEXT to BLOB.
 2024-12-24 10:05:59 +01:00
Earl Warren
2dc167cbb9
 		fix: xorm:version default is inconsistent 
The following message is displayed when upgrading to Forgejo:

[W] Table system_setting Column version db default is , struct default is 1

The same message also shows when upgrading from Gitea 1.21 to Gitea 1.22.

It is fine for the version field to default to zero or NULL instead of one.
 2024-12-24 09:42:47 +01:00
Earl Warren
274bc480b4
 		fix: Gitea last drop 
Some database fields were added in the database to facilitate
migration from Gitea and do not serve any purpose. Drop them since
v1.22 is the last version of the database to allow a transparent
migration to Forgejo.
 2024-12-24 09:42:47 +01:00
Earl Warren
1fffd116e5 Merge pull request '[gitea] week 2024-52 cherry pick (gitea/main -> forgejo)' (#6342) from earl-warren/wcp/2024-52 into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6342
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-12-24 06:28:36 +00:00
Earl Warren
d255a3e3c3 Merge pull request 'Update module google.golang.org/protobuf to v1.36.1 (forgejo)' (#6354) from renovate/forgejo-google.golang.org-protobuf-1.x into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6354
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-12-24 06:24:18 +00:00
Earl Warren
4718062b4c Merge pull request 'chore(docs): explain vars.SKIP_END_TO_END when building a release' (#6357) from earl-warren/forgejo:wip-integration-skip into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6357
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-12-24 06:15:27 +00:00
Earl Warren
92b770326f
 		chore(docs): explain vars.SKIP_END_TO_END when building a release 2024-12-24 06:52:31 +01:00
0ko
5f685bf069 Merge pull request 'Allow changing default branch update style' (#6265) from george.bartolomey/forgejo:1-respect-update-branch-method into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6265
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-12-24 05:08:01 +00:00
Renovate Bot
f9aaefd107 Update dependency idiomorph to v0.4.0 2024-12-24 00:04:32 +00:00
Renovate Bot
7ecd88719e Update module google.golang.org/protobuf to v1.36.1 2024-12-24 00:04:06 +00:00
George Bartolomey
13ca6c14f1
 		feat: allow changing default branch update style 
This commit allows chaning default branch update style through global
and repository settings. The setting affects "Update branch" button
in PR view (button shows when some commits are ahead of master branch).
When default update style is set to "rebase", dropdown button updates branch
by rebase by default. When update style is set to other value, dropdown button
updates branch by merge. Any of these actions may be selected using dropdown
in any case.

Signed-off-by: George Bartolomey <george@bh4.ru>
 2024-12-23 18:55:25 +03:00
Gusted
2df557dff7
 		chore: remove unused dependency from build.go 
Cover merge is used for specific tool that is now also deleted (no good
use case). We don't use Gitea vet and swagger is run via `go run` and
not imported anyway.
 2024-12-23 16:23:28 +01:00
Earl Warren
0bebecc968 Merge pull request 'Update module google.golang.org/grpc to v1.69.2 (forgejo)' (#6322) from renovate/forgejo-google.golang.org-grpc-1.x into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6322
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-12-23 10:56:21 +00:00
Renovate Bot
20b9cbf5df Update module google.golang.org/grpc to v1.69.2 2024-12-23 08:03:41 +00:00
Earl Warren
e266d809e1 Merge pull request 'Update module github.com/go-testfixtures/testfixtures/v3 to v3.14.0 (forgejo)' (#6348) from renovate/forgejo-github.com-go-testfixtures-testfixtures-v3-3.x into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6348
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-12-23 07:07:34 +00:00
Renovate Bot
0c0a1c0fd5 Update renovate Docker tag to v39.82.0 (forgejo) (#6347) 
Co-authored-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
Co-committed-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
 2024-12-23 06:38:24 +00:00
Earl Warren
81e50e0bf5
 		Update module github.com/go-testfixtures/testfixtures/v3 to v3.14.0 (license) 2024-12-23 07:36:18 +01:00
Gusted
b76f1175c5 Merge pull request 'Lock file maintenance (forgejo)' (#6349) from renovate/forgejo-lock-file-maintenance into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6349
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-12-23 06:16:04 +00:00
Renovate Bot
2132759889 Lock file maintenance 2024-12-23 02:04:47 +00:00
Renovate Bot
f4d621ca6e Update module github.com/go-testfixtures/testfixtures/v3 to v3.14.0 2024-12-23 00:05:04 +00:00
Gusted
1597e46fe8 Merge pull request 'fix: repo avatar generating (#6338)' (#6339) from Snoweuph/forgejo:fix/repo-avatar into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6339
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-12-22 19:52:19 +00:00
Snoweuph
be076c98d4
 		fix: repo avatar generating (#6338) 2024-12-22 18:18:37 +01:00
0ko
4e820ff795 feat(ui): show repo size on mobile (#6344) 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6344
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-12-22 17:05:27 +00:00
Gusted
54255688f5 Merge pull request 'fix: template config path (#2836)' (#6335) from Snoweuph/forgejo:fix/template-file into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6335
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-12-22 14:53:16 +00:00
Shiny Nematoda
ee214cb886 feat: filepath filter for code search (#6143) 
Added support for searching content in a specific directory or file.

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6143
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Shiny Nematoda <snematoda.751k2@aleeas.com>
Co-committed-by: Shiny Nematoda <snematoda.751k2@aleeas.com>
 2024-12-22 12:24:29 +00:00
Snoweuph
fcb98c6d3c
 		fix: template config path (#2836) 2024-12-22 11:05:24 +01:00
Lunny Xiao
a5399b473f
 		Add more load functions to make sure the reference object loaded (#32901) 
Fix #32897

(cherry picked from commit dc8f59baa54d4f47edab6feb76a6903947584326)
 2024-12-22 08:46:38 +01:00
wxiaoguang
1e7b2cb6c9
 		Improve Actions status aggregations (#32860) 
Make the result the same as GitHub:

* all skipped, then result is skipped
* any cancelled, then result cancelled

(cherry picked from commit 22c4599542ee3e10bcab4c9136467bbac8e90ba0)
 2024-12-22 08:46:38 +01:00
wxiaoguang
90b65da7e4
 		Fix incomplete Actions status aggregations (#32859) 
fix #32857

(cherry picked from commit d28a4843b8de5d5e01ef3d7b2ad25f22853247ad)

Conflicts:
	web_src/js/components/ActionRunStatus.vue
  remove the refactoring, keep the additional cancelled status
 2024-12-22 08:46:38 +01:00
hiifong
5c1983644e
 		Do not display attestation-manifest and use short sha256 instead of full sha256 (#32851) 
Related: #24973

Before:

![image](https://github.com/user-attachments/assets/bca17900-5075-4d15-af7a-c71bf8979c04)

After:

![image](https://github.com/user-attachments/assets/c5a24e3b-763b-4463-80db-d4dbd89f7dc4)

Index:
```json
{
  "schemaVersion": 2,
  "mediaType": "application/vnd.oci.image.index.v1+json",
  "manifests": [
    {
      "mediaType": "application/vnd.oci.image.manifest.v1+json",
      "digest": "sha256:5967afffdfde104ca1459286a72346baaef8b70ac153325d7a6cd85c7734ac6e",
      "size": 672,
      "platform": {
        "architecture": "amd64",
        "os": "linux"
      }
    },
    {
      "mediaType": "application/vnd.oci.image.manifest.v1+json",
      "digest": "sha256:f9abfcc55320f9ff1f38eeb7dbb4bea10b29c7febfa49ccd7aab9fa02403b9f0",
      "size": 672,
      "platform": {
        "architecture": "arm64",
        "os": "linux"
      }
    },
    {
      "mediaType": "application/vnd.oci.image.manifest.v1+json",
      "digest": "sha256:d70ad19d00c19e40691045cbddc3e8a5a4454c31cc454d1132b13bcaf35b6d46",
      "size": 566,
      "annotations": {
        "vnd.docker.reference.digest": "sha256:5967afffdfde104ca1459286a72346baaef8b70ac153325d7a6cd85c7734ac6e",
        "vnd.docker.reference.type": "attestation-manifest"
      },
      "platform": {
        "architecture": "unknown",
        "os": "unknown"
      }
    },
    {
      "mediaType": "application/vnd.oci.image.manifest.v1+json",
      "digest": "sha256:73bc233bf4eac96a404ce3e0430b698831a4ea7050c878d5f76d1d1f133751dd",
      "size": 566,
      "annotations": {
        "vnd.docker.reference.digest": "sha256:f9abfcc55320f9ff1f38eeb7dbb4bea10b29c7febfa49ccd7aab9fa02403b9f0",
        "vnd.docker.reference.type": "attestation-manifest"
      },
      "platform": {
        "architecture": "unknown",
        "os": "unknown"
      }
    }
  ]
}
```

---------

Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit 276f43330cb86e2ce6bc5a902a43f02727e009e9)

Conflicts:
	templates/package/content/container.tmpl
  simplify to only skip unknown/unknown and not change the display
 2024-12-22 08:46:38 +01:00
Lunny Xiao
967e04534e
 		Fix bug on action list deleted branch (#32848) 
Fix
https://github.com/go-gitea/gitea/issues/32761#issuecomment-2540946064

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 42090844ed2de5e615abc6ece351c152d3344295)

Conflicts:
	models/fixtures/action_run.yml
	models/fixtures/branch.yml
	routers/web/repo/actions/actions_test.go
  trivial context conflict
 2024-12-22 07:21:38 +01:00
0ko
bb88e1daf8 Merge pull request 'Don't notify when a user self-request as reviewer' (#6287) from gabrielgio/forgejo:bug/5567_irrelevant_notification into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6287
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-12-22 06:10:55 +00:00
Gusted
1e7b922e44 Merge pull request 'fix: keep commit count limit in file history pagination static and not increase with every page' (#6337) from emilylange/fix-file-history-commit-pagination-limit into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6337
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-12-22 00:02:38 +00:00
emilylange
cd2c1361c5
 		fix: keep commit count limit in file history pagination static and not increase with every page 
This fixes a regression introduced by 58a4407acb
from 2022 which reintroduced passing `--skip` to `git rev-list` in favor
of the custom skipping reader based on `io.CopyN` from 59d1cc49f1
and then forgetting to also revert the
`--max-count=CommitsRangeSize*Page` math.

Before this commit:

~~~bash
# curl -s "http://localhost:3000/api/v1/repos/forgejo/forgejo/commits?path=templates&page=1" | jq length
50

# curl -s "http://localhost:3000/api/v1/repos/forgejo/forgejo/commits?path=templates&page=2" | jq length
100

# curl -s "http://localhost:3000/api/v1/repos/forgejo/forgejo/commits?path=templates&page=10" | jq length
500
~~~

With this commit applied:

~~~bash
# curl -s "http://localhost:3000/api/v1/repos/forgejo/forgejo/commits?path=templates&page=1" | jq length
50

# curl -s "http://localhost:3000/api/v1/repos/forgejo/forgejo/commits?path=templates&page=2" | jq length
50

# curl -s "http://localhost:3000/api/v1/repos/forgejo/forgejo/commits?path=templates&page=10" | jq length
50
~~~
 2024-12-21 23:46:29 +01:00
Maxim Slipenko
4f92b738b5 style: make fmt 2024-12-21 21:44:05 +00:00
Maxim Slipenko
283d883e5a add integration tests for synchronization for SSH keys with OpenID Connect 2024-12-21 21:25:45 +00:00
Maxim Slipenko
515eec3d1a remove len(sshKeys) == 0 check 2024-12-21 21:25:38 +00:00
Gabriel A. Giovanini
d7fa527605 test: Test notification count for self review 
This tests the case where the user adds itself as reviewer and it
shouldn't get a notification.
 2024-12-21 20:03:36 +01:00
Gabriel A. Giovanini
b698b256f1 fix: Ignore self review request notification 
A notification would be trigger if a user request itself as review of a
PR.
 2024-12-21 20:03:36 +01:00
Maks1mS
c271779092 Merge branch 'forgejo' into feat/add-oidc-ssh-keys 2024-12-21 18:01:25 +00:00
Gusted
5b542d6c79 Merge pull request 'fix: maven package where actual pom has no group-id defined, fallback to parent group-id' (#6329) from JSchlarb/forgejo:forgejo into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6329
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-12-21 15:46:58 +00:00
Julian Schlarb
b15352ceb0 fix: maven fallback to parent groupId 2024-12-21 11:48:09 +01:00
Earl Warren
248977c518 Merge pull request 'Update dependency forgejo-lxc to v12 (forgejo)' (#6210) from renovate/forgejo-forgejo-lxc-12.x into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6210
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-12-21 08:30:27 +00:00
Renovate Bot
c1898c745e Update dependency forgejo-lxc to v12 2024-12-21 04:03:00 +00:00
Gusted
2102163f2f Merge pull request 'chore: avoid using gock' (#6311) from gusted/forgejo-gock into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6311
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
 2024-12-20 21:15:11 +00:00