mirror of
1
Fork 0
Commit Graph

21949 Commits

Author SHA1 Message Date
Lunny Xiao 2b5c69c451
Detect whether action view branch was deleted (#32764)
Fix #32761

![图片](https://github.com/user-attachments/assets/a5a7eef8-0fea-4242-b199-1b0b73d9bbdb)

(cherry picked from commit 6370d2fb93a5ee897b82969ca30a9feb33667714)

Conflicts:
	routers/web/repo/actions/actions.go
	routers/web/repo/actions/view.go
  trivial context conflicts
2024-12-15 09:45:10 +01:00
Kemal Zebari b0d6a7f07b
Implement update branch API (#32433)
Resolves #22526.

Builds upon #23061.

---------

Co-authored-by: sillyguodong <33891828+sillyguodong@users.noreply.github.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 01b1896bf5eacfd7f4f64d9ebb0ad165e3e60a5c)

Conflicts:
	routers/api/v1/api.go
  context conflict + s/PathParam/Params/
	templates/swagger/v1_json.tmpl
  make generate-swagger
2024-12-15 09:24:31 +01:00
RiceChuan c3d37894aa
chore: use errors.New to replace fmt.Errorf with no parameters (#32800)
use errors.New to replace fmt.Errorf with no parameters

Signed-off-by: RiceChuan <lc582041246@gmail.com>
(cherry picked from commit dfd75944992fc6508ec891b4c29715c23e59e4ed)
2024-12-15 09:15:57 +01:00
Sebastian T. T. bf934c96c9
Add standard-compliant route to serve outdated R packages (#32783)
The R package repository currently does not have support for older
versions of packages which should be stored in a separate /Archive
router. This PR remedies that by adding a new path router.

I am a member of a group that loves using Gitea and this bug has been
annoying us for a long time. Hope it can be merged in time for Gitea
1.23.0.

Any feedback much appreciated.

Fixes #32782

(cherry picked from commit 874b8484aa9f7e10172fd1a8a7c768e70b36c475)
2024-12-15 09:12:46 +01:00
Earl Warren c368df39b0 Merge pull request 'Replace actions/cascading-pr action with actions/cascading-pr v2.1.1 (forgejo)' (#6226) from renovate/forgejo-actions-cascading-pr-replacement into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6226
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-12-15 07:18:50 +00:00
0ko f5cfdd80a7 Merge pull request 'Regular visual regression testing' (#6117) from fnetx/playwright-visual into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6117
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-12-14 12:54:07 +00:00
Otto c1d882df5b Merge pull request 'fix: Do not offer duplicating a PR for a recently pushed branch' (#6191) from wetneb/forgejo:6187-recent-branches into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6191
Reviewed-by: Otto <otto@codeberg.org>
2024-12-13 19:09:39 +00:00
Otto 05fb3692f7 Merge pull request 'Simplify main-attribute labels' (#6201) from 0ko/forgejo:ui-simple-spec-labels into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6201
Reviewed-by: Otto <otto@codeberg.org>
2024-12-13 19:05:52 +00:00
Otto 3fc0979f63 Merge pull request 'Add missing automerge feed message' (#6233) from 0ko/forgejo:ui-feeds-automerge into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6233
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Reviewed-by: Otto <otto@codeberg.org>
2024-12-13 19:04:02 +00:00
Renovate Bot ad9c5acba9 Update module github.com/gliderlabs/ssh to v0.3.8 (forgejo) (#6258)
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6258
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Co-authored-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
Co-committed-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
2024-12-13 05:55:36 +00:00
Renovate Bot 53334af9e4 Update module golang.org/x/tools/gopls to v0.17.0 (forgejo) (#6260)
Co-authored-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
Co-committed-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
2024-12-13 05:43:42 +00:00
Awiteb 70348e159f Ensure `source_id` parameter is not skipped when set to 0 and correctly filter users in `/api/v1/admin/users` endpoint (#6240)
Signed-off-by: Awiteb <a@4rs.nl>
Fixes: #6239

## Checklist

### Tests

- I added test coverage for Go changes...
  - [ ] in their respective `*_test.go` for unit tests.
  - [X] in the `tests/integration` directory if it involves interactions with a live Forgejo server.
- I added test coverage for JavaScript changes...
  - [ ] in `web_src/js/*.test.js` if it can be unit tested.
  - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)).

### Documentation

- [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change.
- [X] I did not document these changes and I do not expect someone else to do it.

### Release notes

- [ ] I do not want this change to show in the release notes.
- [X] I want the title to show in the release notes with a link to this pull request.
- [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title.

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6240
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: Awiteb <a@4rs.nl>
Co-committed-by: Awiteb <a@4rs.nl>
2024-12-13 05:42:01 +00:00
forgejo-release-manager 403a81bdb5 chore(release-notes): Forgejo v7.0.12 (#6255)
https://codeberg.org/forgejo/forgejo/milestone/8832
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6255
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: forgejo-release-manager <contact-forgejo-release-manager@forgejo.org>
Co-committed-by: forgejo-release-manager <contact-forgejo-release-manager@forgejo.org>
2024-12-12 18:13:38 +00:00
forgejo-release-manager 835e72b247 chore(release-notes): Forgejo v9.0.3 (#6256)
https://codeberg.org/forgejo/forgejo/milestone/8833
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6256
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: forgejo-release-manager <contact-forgejo-release-manager@forgejo.org>
Co-committed-by: forgejo-release-manager <contact-forgejo-release-manager@forgejo.org>
2024-12-12 18:13:29 +00:00
0ko 4948380069 fix(ui): use correct title for container images (#6254)
Fixed the wrong box title here:
https://codeberg.org/attachments/5e3a8443-f1f3-4fdd-922e-0426ba370bc7

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6254
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-12-12 17:35:52 +00:00
Otto e21ad7dfaf Merge pull request 'Adjust MySQL instruction' (#6245) from 0ko/forgejo:doctor into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6245
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
2024-12-12 14:08:10 +00:00
Earl Warren da76eb3962 Merge pull request 'Update module golang.org/x/crypto to v0.31.0 (forgejo)' (#6243) from renovate/forgejo-golang.org-x-crypto-0.x into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6243
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-12-12 05:58:41 +00:00
Earl Warren a6d4505d76 Merge pull request 'fix: ensure correct ssh public key is used for authentication' (#6248) from earl-warren/forgejo:wip-ssh into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6248
2024-12-12 05:57:17 +00:00
Earl Warren f18f447575 Merge pull request 'fix: Revert "allow synchronizing user status from OAuth2 login providers (#31572)"' (#6249) from earl-warren/forgejo:wip-oauth2 into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6249
2024-12-12 05:42:43 +00:00
Gusted 7f8f9b878f
fix: Revert "allow synchronizing user status from OAuth2 login providers (#31572)"
This commit has a fundamental flaw, in order to syncronize if external
users are still active the commit checks if the refresh token is
accepted by the OAuth provider, if that is not the case it sees that as
the user is disabled and sets the is active field to `false` to signal
that. Because it might be possible (this commit makes this a highly
likelyhood) that the OAuth provider still recognizes this user the
commit introduces code to allow users to re-active themselves via the
oauth flow if they were disabled because of this. However this code
makes no distinction in why the user was disabled and always re-actives
the user.

Thus the reactivation via the OAuth flow allows users to bypass the
manually activation setting (`[service].REGISTER_MANUAL_CONFIRM`) or if
the admin for other reasons disabled the user.

This reverts commit 21fdd28f08.
2024-12-12 05:59:06 +01:00
Gusted 3e1b03838e
fix: ensure correct ssh public key is used for authentication
- The root cause is described in b4f1988a35
- Move to a fork of `github.com/gliderlabs/ssh` that exposes the
permissions that was chosen by `x/crypto/ssh` after succesfully
authenticating, this is the recommended mitigation by the Golang
security team. The fork exposes this, since `gliderlabs/ssh` instead
relies on context values to do so, which is vulnerable to the same
attack, although partially mitigated by the fix in `x/crypto/ssh` it
would not be good practice and defense deep to rely on it.
- Existing tests covers that the functionality is preserved.
- No tests are added to ensure it fixes the described security, the
exploit relies on non-standard SSH behavior it would be too hard to
craft SSH packets to exploit this.
2024-12-12 05:54:07 +01:00
0ko eef45a73c9 branding: adjust mysql instruction 2024-12-12 09:08:24 +05:00
Renovate Bot eda4d1b753 Update module golang.org/x/crypto to v0.31.0 2024-12-12 00:03:06 +00:00
Gusted 80179a373d Merge pull request 'Update dependency katex to v0.16.15 (forgejo)' (#6229) from renovate/forgejo-katex-0.x into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6229
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-12-11 20:34:09 +00:00
Earl Warren 8a8de046f8 Merge pull request 'Replace actions/setup-forgejo action with actions/setup-forgejo v1.0.1 (forgejo)' (#6227) from renovate/forgejo-actions-setup-forgejo-replacement into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6227
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-12-11 17:23:52 +00:00
0ko ac6f9ea17d i18n: avoid storing i18n linter exceptions for <filename> (#6237)
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6237
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-12-11 16:38:42 +00:00
Codeberg Translate 0c74cde4e6 i18n: update of translations from Codeberg Translate (#6161)
Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org>
Co-authored-by: artnay <artnay@users.noreply.translate.codeberg.org>
Co-authored-by: Edgarsons <Edgarsons@users.noreply.translate.codeberg.org>
Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org>
Co-authored-by: Benedikt Straub <benedikt-straub@web.de>
Co-authored-by: yeziruo <yeziruo@users.noreply.translate.codeberg.org>
Co-authored-by: xtex <xtexchooser@duck.com>
Co-authored-by: Wuzzy <wuzzy@disroot.org>
Co-authored-by: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Co-authored-by: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: antaanimosity <antaanimosity@users.noreply.translate.codeberg.org>
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: Kita Ikuyo <searinminecraft@courvix.com>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6161
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org>
Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org>
2024-12-11 15:26:40 +00:00
Gusted 4cbcd41bf2 Merge pull request 'Update github.com/grafana/go-json digest to a119ee5 (forgejo)' (#6234) from renovate/forgejo-github.com-grafana-go-json-digest into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6234
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-12-11 14:24:22 +00:00
Earl Warren 1b66719357 Merge pull request 'chore(release-notes): keep release notes in release-notes-published' (#6165) from earl-warren/forgejo:wip-release-notes into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6165
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-12-11 09:23:35 +00:00
Renovate Bot 3bca714bb2 Update github.com/grafana/go-json digest to a119ee5 2024-12-11 00:03:09 +00:00
Antonin Delpeuch 9c2f3dac71 Reduce delay to 30 minutes 2024-12-10 22:51:44 +01:00
0ko 3149aee3cc fix(ui): add missing automerge feed message 2024-12-10 23:10:16 +05:00
Otto Richter 840605cc75 tests(e2e): Generate more screenshots
- create screenshots on tests that create a custom page
- skip screenshot on a page that uses the default page (it is added
  automatically and already exists)
- replace a useless response wait and assert the correct page style
  instead
2024-12-10 18:12:51 +01:00
Otto Richter 5929b330e4 tests(e2e): Prepare for visual regression testing
- fix some configuration issues
- mask or replace dynamic content from screenshots
- explain the behaviour in the e2e README

readme
2024-12-10 18:12:36 +01:00
Otto 0cac04d3dd Merge pull request 'Clipboard read permission for Chromium' (#6222) from 0ko/forgejo:e2e-clipboard into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6222
Reviewed-by: Otto <otto@codeberg.org>
2024-12-10 15:26:10 +00:00
0ko 281469ebd1 fix(e2e): clipboard read permission for Chromium 2024-12-10 19:51:39 +05:00
Earl Warren 021c8fe15a Merge pull request '[gitea] week 2024-50 cherry pick (gitea/main -> forgejo)' (#6200) from earl-warren/wcp/2024-50 into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6200
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-12-10 06:23:36 +00:00
Earl Warren e6629fa5d1 Merge pull request 'chore(ci): set the milestone when a pull request is closed (take 4)' (#6223) from earl-warren/forgejo:wip-milestones into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6223
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-12-10 06:20:39 +00:00
Earl Warren a900775ada Merge pull request 'Add `-` as reserved user' (#6221) from fnetx/- into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6221
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-12-10 06:19:26 +00:00
Renovate Bot 28a23c1f13 Update dependency katex to v0.16.15 2024-12-10 02:02:51 +00:00
Renovate Bot 301b1bb941 Replace actions/setup-forgejo action with actions/setup-forgejo v1.0.1 2024-12-10 00:03:36 +00:00
Renovate Bot 96fd97b7a9 Replace actions/cascading-pr action with actions/cascading-pr v2.1.1 2024-12-10 00:03:22 +00:00
Earl Warren 6f53f7d007
chore(ci): set the milestone when a pull request is closed (take 4)
The milestone can only be determined to be final when a pull request
is merged.

It is possible that a pull request is opened during the development of
v10 and merged after it is published.

It is also possible that it is permanently closed without being merged.
2024-12-09 23:49:33 +01:00
Earl Warren 5cb542e0d9 Merge pull request 'chore(ci): set the milestone when a pull request is open (take 3)' (#6219) from earl-warren/forgejo:wip-milestones into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6219
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-12-09 22:49:05 +00:00
0ko 4fbdd1fc8c ui: add copy path button to file view (#6079)
Port of d11f8d24b0.
Followup to 187e10d8c9.

* removed `aria-label` in the diff template
* changed `Copy to clipboard` to `Copy path`
* left `copy_generic` for now, but it's unused
* ported the addition of this button to the file view template

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6079
Reviewed-by: Otto <otto@codeberg.org>
Co-authored-by: silverwind <me@silverwind.io>
2024-12-09 19:32:16 +00:00
Otto Richter 5f173bdab3 Add `-` as reserved user
used in routers such as
af640ac4d4/routers/init.go (L185)
2024-12-09 18:45:05 +01:00
Earl Warren bf9e19cc21
chore(ci): set the milestone when a pull request is open (take 3)
pull_request_target runs from the target branch, not the default branch
2024-12-09 17:49:54 +01:00
Earl Warren af640ac4d4 Merge pull request 'chore(ci): set the milestone when a pull request is open (take 2)' (#6213) from earl-warren/forgejo:wip-milestones into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6213
2024-12-09 16:07:39 +00:00
Earl Warren ebfe702df6
chore(ci): set the milestone when a pull request is open (take 2)
Use the oci:ci image to get jq
2024-12-09 17:01:35 +01:00
Earl Warren 15fdb5c768 Merge pull request 'chore(ci): set the milestone when a pull request is open [skip ci]' (#6211) from earl-warren/forgejo:wip-milestones into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6211
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-12-09 15:56:14 +00:00