mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-01-09 00:26:00 +00:00
Code Issues Projects Releases Packages Wiki Activity
22091 commits 16 branches 238 tags 626 MiB
Commit graph

22091 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maxim Slipenko
af88ddae8c Merge branch 'feat/add-oidc-ssh-keys' of codeberg.org:Maks1mS/forgejo into feat/add-oidc-ssh-keys 2024-12-27 11:18:27 +03:00
Maxim Slipenko
666654a5ef fix: return empty slice if AttributeSSHPublicKey is missing in RawData 2024-12-27 11:17:27 +03:00
Maks1mS
8a3fb4885e Merge branch 'forgejo' into feat/add-oidc-ssh-keys 2024-12-26 14:33:09 +00:00
Codeberg Translate
e94134def6 i18n: update of translations from Codeberg Translate (#6331) 
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: tacaly <tacaly@users.noreply.translate.codeberg.org>
Co-authored-by: tacaly <frederick@tacaly.com>
Co-authored-by: artnay <artnay@users.noreply.translate.codeberg.org>
Co-authored-by: WithLithum <withlithum@users.noreply.translate.codeberg.org>
Co-authored-by: Wuzzy <wuzzy@disroot.org>
Co-authored-by: Atalanttore <atalanttore@users.noreply.translate.codeberg.org>
Co-authored-by: Juno Takano <jutty@users.noreply.translate.codeberg.org>
Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org>
Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org>
Co-authored-by: Edgarsons <edgarsons@users.noreply.translate.codeberg.org>
Co-authored-by: Benedikt Straub <benedikt-straub@web.de>
Co-authored-by: SomeTr <sometr@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6331
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org>
Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org>
 2024-12-26 09:26:46 +00:00
Earl Warren
410c8b913f Merge pull request 'chore(i18n): user/label translations in danish/latvian' (#6375) from earl-warren/forgejo:wip-lint-locale into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6375
 2024-12-26 08:46:33 +00:00
Earl Warren
5eb0877381
chore(i18n): user/label translations in danish/latvian 
Refs: https://codeberg.org/forgejo/forgejo/pulls/6331
 2024-12-26 09:40:21 +01:00
Earl Warren
180fb3f4d6 Merge pull request 'Revert "Update dependency idiomorph to v0.4.0"' (#6372) from gusted/forgejo-idiomorph-revert into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6372
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-12-26 07:52:58 +00:00
Gusted
64deec434a
Revert "Update dependency idiomorph to v0.4.0" 
This reverts commit f9aaefd107.

I've not not yet been able to determine what commit caused it, but 0.4.0
is broken for Forgejo's usecase it's not morphing and instead
replacing (it seems) elements when there's no need to.
 2024-12-25 23:08:03 +01:00
Earl Warren
6836ded397
chore(release): first commit of v11.0 2024-12-25 11:22:30 +01:00
Earl Warren
7b5932738e Merge pull request 'feat: harden keying implementation' (#6368) from gusted/forgejo-harden-keying into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6368
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-12-25 08:05:56 +00:00
Renovate Bot
f9ffc91ace Update dependency djlint to v1.36.4 (forgejo) (#6365) 
Co-authored-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
Co-committed-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
 2024-12-25 00:37:19 +00:00
Gusted
967603abcc
feat: harden keying implementation 
Harden the current checks in place, I doubt these will ever hit (you can
prove easily by reading the current source code this cannot happen) but
just in case a new Go version does something weird or something else
goes catastrophicly wrong, this should add an extra defense-in-depth
layer.

`n != aeadKeySize` will panic a nil error, don't think it's needed to
add more logic to this, a nil error is enough to indicate that that
condition failed (given the other condition is `err != nil`).

Also move constant integers to being `const`, this helps reducing the
amount of instructions being done for the extra check.
 2024-12-25 00:10:18 +01:00
Renovate Bot
6bbc9001e9 Update dependency @vitest/eslint-plugin to v1.1.20 (forgejo) (#6364) 
Co-authored-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
Co-committed-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
 2024-12-24 23:02:35 +00:00
Renovate Bot
f5d868e2d3 Update linters (forgejo) (#6366) 
Co-authored-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
Co-committed-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
 2024-12-24 23:01:52 +00:00
Gusted
87994cc2a0 Merge pull request 'Update dependency webpack-cli to v6 (forgejo)' (#6367) from renovate/forgejo-webpack-cli-6.x into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6367
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-12-24 23:01:11 +00:00
Gusted
8d7bc15f88 Merge pull request 'Update github.com/shurcooL/vfsgen digest to 0000e14 (forgejo)' (#6363) from renovate/forgejo-github.com-shurcool-vfsgen-digest into forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6363
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-12-24 23:01:07 +00:00
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