0ko
f5c0570533
ui: improve git notes
2024-11-19 10:27:57 +05:00
Earl Warren
298863c701
Merge pull request 'Don't display email in profile settings when hidden' ( #6018 ) from 0ko/forgejo:ui-settings-email-vis into forgejo
...
/ release (push) Waiting to run
testing / backend-checks (push) Waiting to run
testing / frontend-checks (push) Waiting to run
testing / test-e2e (push) Blocked by required conditions
testing / test-remote-cacher (redis) (push) Blocked by required conditions
testing / test-remote-cacher (garnet) (push) Blocked by required conditions
testing / test-remote-cacher (redict) (push) Blocked by required conditions
testing / test-pgsql (push) Blocked by required conditions
testing / test-unit (push) Blocked by required conditions
testing / test-remote-cacher (valkey) (push) Blocked by required conditions
testing / test-mysql (push) Blocked by required conditions
testing / test-sqlite (push) Blocked by required conditions
testing / security-check (push) Blocked by required conditions
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6018
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
2024-11-18 23:06:52 +00:00
JakobDev
f90928507a
[FEAT]Allow changing git notes ( #4753 )
...
Git has a cool feature called git notes. It allows adding a text to a commit without changing the commit itself. Forgejo already displays git notes. With this PR you can also now change git notes.
<details>
<summary>Screenshots</summary>
</details>
## Checklist
The [developer guide](https://forgejo.org/docs/next/developer/ ) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md ). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org ).
### 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.
<!--start release-notes-assistant-->
## Release notes
<!--URL:https://codeberg.org/forgejo/forgejo-- >
- Features
- [PR](https://codeberg.org/forgejo/forgejo/pulls/4753 ): <!--number 4753 --><!--line 0 --><!--description QWxsb3cgY2hhbmdpbmcgZ2l0IG5vdGVz-->Allow changing git notes<!--description-->
<!--end release-notes-assistant-->
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4753
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Co-authored-by: JakobDev <jakobdev@gmx.de>
Co-committed-by: JakobDev <jakobdev@gmx.de>
2024-11-18 22:56:17 +00:00
Earl Warren
71ff98d61d
Merge pull request 'Update help links on page with no workflows' ( #5697 ) from kwonunn/fix-empty-actions-page into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5697
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-11-18 21:50:31 +00:00
Marco De Araujo
1f4be5baad
Escaping specific markdown in commit messages on Discord-type embeds #3664 ( #5811 )
...
Co-authored-by: Marco De Araujo <marco.araujo.junior@gmail.com>
Co-committed-by: Marco De Araujo <marco.araujo.junior@gmail.com>
2024-11-18 21:47:11 +00:00
Earl Warren
cff7754735
Merge pull request 'ci: disable postgresql fsync' ( #5962 ) from viceice/ci/pg/fsync into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5962
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-11-18 21:43:15 +00:00
Earl Warren
0fb3e45ca5
Merge pull request 'chore(ci): merge jobs issue label jobs in one workflow' ( #6021 ) from earl-warren/forgejo:wip-ci-labels into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6021
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-11-18 20:33:38 +00:00
Earl Warren
1806db31d1
chore(ci): merge jobs in issue-labels.yml in one workflow
...
Fixes : forgejo/forgejo#5999
2024-11-18 19:43:35 +01:00
Earl Warren
7c1f3a7594
chore(ci): cat all issue labels workflows in issue-labels.yml
...
cat cascade-setup-end-to-end.yml backport.yml merge-requirements.yml release-notes-assistant.yml > issue-labels.yml
rm cascade-setup-end-to-end.yml backport.yml merge-requirements.yml release-notes-assistant.yml
2024-11-18 19:40:15 +01:00
Earl Warren
3c3c9b22a9
Merge pull request 'chore(ci): make release-notes-assistant job copy/pastable (part two)' ( #6020 ) from earl-warren/forgejo:wip-ci-labels into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6020
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-11-18 18:10:13 +00:00
Earl Warren
73cb6c9204
chore(ci): make release-notes-assistant job copy/pastable (part two)
...
The event is pull_request_target
Refs: forgejo/forgejo#5999
2024-11-18 18:11:07 +01:00
Earl Warren
25354c03a5
Merge pull request 'chore(ci): make release-notes-assistant job copy/pastable' ( #6019 ) from earl-warren/forgejo:wip-ci-labels into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6019
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-11-18 17:02:59 +00:00
Earl Warren
18cecf124f
chore(ci): make release-notes-assistant job copy/pastable
...
Refs: forgejo/forgejo#5999
2024-11-18 17:23:33 +01:00
Earl Warren
2f1b1d8b80
Merge pull request 'feat: use oci mirror for tonistiigi/xx image' ( #5965 ) from viceice/feat/oci-mirror into forgejo
...
/ release (push) Waiting to run
testing / backend-checks (push) Waiting to run
testing / frontend-checks (push) Waiting to run
testing / test-unit (push) Blocked by required conditions
testing / test-e2e (push) Blocked by required conditions
Integration tests for the release process / release-simulation (push) Has been cancelled
testing / test-remote-cacher (redis) (push) Blocked by required conditions
testing / test-remote-cacher (valkey) (push) Blocked by required conditions
testing / test-remote-cacher (garnet) (push) Blocked by required conditions
testing / test-remote-cacher (redict) (push) Blocked by required conditions
testing / test-mysql (push) Blocked by required conditions
testing / test-pgsql (push) Blocked by required conditions
testing / test-sqlite (push) Blocked by required conditions
testing / security-check (push) Blocked by required conditions
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5965
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-11-18 14:54:05 +00:00
0ko
c3653e0eaa
ui: don't display email in profile settings when hidden
2024-11-18 17:06:38 +05:00
Earl Warren
4a3f8f3004
Merge pull request 'fix(test): TestGitAttributeCheckerError must allow broken pipe' ( #6013 ) from earl-warren/forgejo:wip-ci-cancel into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6013
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
2024-11-18 11:28:52 +00:00
Otto
6cfaebf043
Merge pull request 'chore(ci): make backporting job copy/pastable' ( #6002 ) from earl-warren/forgejo:wip-ci-labels-backports into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6002
Reviewed-by: Otto <otto@codeberg.org>
2024-11-18 10:44:38 +00:00
Earl Warren
e0b37253c8
Merge pull request 'Lock file maintenance (forgejo)' ( #6010 ) from renovate/forgejo-lock-file-maintenance into forgejo
...
Integration tests for the release process / release-simulation (push) Waiting to run
testing / backend-checks (push) Waiting to run
testing / test-unit (push) Blocked by required conditions
testing / test-remote-cacher (redis) (push) Blocked by required conditions
testing / test-mysql (push) Blocked by required conditions
testing / test-pgsql (push) Blocked by required conditions
/ release (push) Waiting to run
testing / frontend-checks (push) Waiting to run
testing / test-e2e (push) Blocked by required conditions
testing / test-remote-cacher (valkey) (push) Blocked by required conditions
testing / test-remote-cacher (garnet) (push) Blocked by required conditions
testing / test-remote-cacher (redict) (push) Blocked by required conditions
testing / test-sqlite (push) Blocked by required conditions
testing / security-check (push) Blocked by required conditions
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6010
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-11-18 07:24:40 +00:00
Earl Warren
b9697f5227
fix(test): TestGitAttributeCheckerError must allow broken pipe
...
Early cancelation can lead to two kinds of error. Either canceled or
broken pipe, depending on when the goroutine stops.
Fixes : forgejo/forgejo#6012
2024-11-18 08:20:10 +01:00
Renovate Bot
6553148de9
Update renovate to v39.19.1 (forgejo) ( #6008 )
...
Co-authored-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
Co-committed-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
2024-11-18 05:52:58 +00:00
Renovate Bot
387ed7e072
Lock file maintenance
2024-11-18 00:05:26 +00:00
Otto
289c22cc4a
Merge pull request 'fix: vertical center the date on GPG keys' ( #6006 ) from gusted/forgejo-ui-gpg into forgejo
...
/ release (push) Waiting to run
testing / backend-checks (push) Waiting to run
testing / test-remote-cacher (redis) (push) Blocked by required conditions
testing / frontend-checks (push) Waiting to run
testing / test-unit (push) Blocked by required conditions
testing / test-e2e (push) Blocked by required conditions
testing / test-remote-cacher (valkey) (push) Blocked by required conditions
testing / test-sqlite (push) Blocked by required conditions
testing / test-remote-cacher (redict) (push) Blocked by required conditions
testing / test-mysql (push) Blocked by required conditions
testing / test-pgsql (push) Blocked by required conditions
testing / security-check (push) Blocked by required conditions
testing / test-remote-cacher (garnet) (push) Blocked by required conditions
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6006
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
2024-11-17 23:17:19 +00:00
Renovate Bot
4163402f5e
Update dependency vue to v3.5.13 (forgejo) ( #5981 )
...
Co-authored-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
Co-committed-by: Renovate Bot <forgejo-renovate-action@forgejo.org>
2024-11-17 21:23:23 +00:00
Gusted
662e9c53d9
fix: vertical center the date on GPG keys
...
- Ensure the 'added on' and the date are centered vertically the same.
- Regression #5796
2024-11-17 21:53:37 +01:00
Gusted
e31090cf4b
Merge pull request 'fix: check read permissions for code owner review requests' ( #5996 ) from gusted/forgejo-codeowners into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5996
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-11-17 19:13:46 +00:00
Gusted
2cc3278791
Merge pull request 'fix: use better code to group UID and stopwatches' ( #5989 ) from gusted/improve-uid-stopwatches into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5989
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-11-17 19:13:30 +00:00
Gusted
693f7731f9
fix: check read permissions for code owner review requests
...
- Only send a review request based on the code owner file if the code
owner user has read permissions to the pull requests of that repository.
- This avoids leaking title of PRs from private repository when a
CODEOWNER file is present which contains users that do not have access
to the private repository.
- Found by @oliverpool.
- Integration test added.
2024-11-17 20:12:59 +01:00
Earl Warren
b6869d643e
chore(ci): make backporting job copy/pastable
...
Refs: forgejo/forgejo#5999
2024-11-17 19:17:11 +01:00
Earl Warren
abec2442b7
Merge pull request 'chore(ci): make merge-conditions job copy/pastable' ( #6001 ) from earl-warren/forgejo:wip-ci-labels into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6001
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-11-17 18:13:16 +00:00
Earl Warren
64a89c8d33
chore(ci): make merge-conditions job copy/pastable
...
Refs: forgejo/forgejo#5999
2024-11-17 17:57:40 +01:00
Gusted
76f172b080
Merge pull request 'fix: remember fuzzy for open/close state' ( #5995 ) from gusted/forgejo-remember-fuzzy into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5995
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Shiny Nematoda <snematoda@noreply.codeberg.org>
2024-11-17 15:27:48 +00:00
Earl Warren
a5363a539b
Merge pull request 'chore(ci): make end-to-end job copy/pastable' ( #6000 ) from earl-warren/forgejo:wip-ci-labels into forgejo
...
/ release (push) Waiting to run
testing / security-check (push) Blocked by required conditions
testing / backend-checks (push) Waiting to run
testing / frontend-checks (push) Waiting to run
testing / test-unit (push) Blocked by required conditions
testing / test-e2e (push) Blocked by required conditions
testing / test-remote-cacher (redis) (push) Blocked by required conditions
testing / test-sqlite (push) Blocked by required conditions
testing / test-remote-cacher (garnet) (push) Blocked by required conditions
testing / test-remote-cacher (redict) (push) Blocked by required conditions
testing / test-mysql (push) Blocked by required conditions
testing / test-remote-cacher (valkey) (push) Blocked by required conditions
testing / test-pgsql (push) Blocked by required conditions
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6000
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-11-17 13:33:43 +00:00
Earl Warren
b5161325ef
chore(ci): make end-to-end job copy/pastable
...
Refs: forgejo/forgejo#5999
2024-11-17 13:33:21 +01:00
Gusted
9701e5e0ff
fix: remember fuzzy for open/close state
...
- Remember if fuzzy was set or not for the open/close/all states.
- Use `fuzzy=false` for test, as `fuzzy=true` is the default (this is
the opposite of all the other values).
- Remove `ctx.Link` prefix for open/close states, this makes them
suspectible to the existing tests (the other filter links are also in
the format of simply having `?xx=xx&yy=yy`).
- Fix typo in test name.
2024-11-17 02:06:51 +01:00
Gusted
da40383cf4
Revert defaulting to EdDSA
...
/ release (push) Waiting to run
testing / backend-checks (push) Waiting to run
testing / frontend-checks (push) Waiting to run
testing / test-unit (push) Blocked by required conditions
testing / test-e2e (push) Blocked by required conditions
testing / test-remote-cacher (redis) (push) Blocked by required conditions
testing / test-remote-cacher (valkey) (push) Blocked by required conditions
testing / test-sqlite (push) Blocked by required conditions
testing / test-remote-cacher (garnet) (push) Blocked by required conditions
testing / test-remote-cacher (redict) (push) Blocked by required conditions
testing / test-mysql (push) Blocked by required conditions
testing / test-pgsql (push) Blocked by required conditions
testing / security-check (push) Blocked by required conditions
- Apparently JWT actually checks when doing a JWT operation if the key type is valid and not on startup, this caused errors unfortunately.
2024-11-17 00:42:31 +00:00
Gusted
8e94947ed9
Merge pull request 'fix: api repo compare with commit hashes' ( #5991 ) from angelnu/forgejo:angelnu/IsCommitExist into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5991
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-11-16 23:35:34 +00:00
Gusted
c01a03e93d
Merge pull request 'feat: default to generating EdDSA for OAuth JWT signing key' ( #5987 ) from gusted/forgejo-default-eddsa-oauth-jwt into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5987
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-11-16 23:34:58 +00:00
Angel Nunez Mencias
ca0cd42d7a
simplify test based on feedback
2024-11-16 22:31:14 +01:00
Angel Nunez Mencias
01c9c19536
fmt
2024-11-16 18:12:40 +01:00
angelnu
1b9d1240eb
add test
2024-11-16 18:12:40 +01:00
angelnu
d2dc4fae3a
review changes
2024-11-16 18:12:40 +01:00
angelnu
e434ecdaca
check IsCommitExist
2024-11-16 18:12:40 +01:00
Earl Warren
569a67327c
Merge pull request 'bug: correctly generate oauth2 jwt signing key' ( #5986 ) from gusted/improve-oauth2-jwt into forgejo
...
/ release (push) Waiting to run
testing / backend-checks (push) Waiting to run
testing / frontend-checks (push) Waiting to run
testing / test-unit (push) Blocked by required conditions
testing / test-e2e (push) Blocked by required conditions
testing / test-remote-cacher (redis) (push) Blocked by required conditions
testing / test-remote-cacher (valkey) (push) Blocked by required conditions
testing / test-sqlite (push) Blocked by required conditions
testing / test-remote-cacher (garnet) (push) Blocked by required conditions
testing / test-remote-cacher (redict) (push) Blocked by required conditions
testing / security-check (push) Blocked by required conditions
testing / test-mysql (push) Blocked by required conditions
testing / test-pgsql (push) Blocked by required conditions
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5986
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-11-16 17:04:31 +00:00
Gusted
146824badc
Merge pull request 'feat: improve GetLatestCommitStatusForPairs' ( #5983 ) from gusted/improve-commit-pairs into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5983
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
2024-11-16 15:54:40 +00:00
Earl Warren
eaa66f85f6
Merge pull request '[gitea] week 2024-46 cherry pick (gitea/main -> forgejo)' ( #5988 ) from earl-warren/wcp/2024-46 into forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5988
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-11-16 15:49:01 +00:00
Gusted
e4eb82b738
fix: use better code to group UID and stopwatches
...
- Instead of having code that relied on the result being sorted (which
wasn't specified in the query and therefore not safe to assume so). Use
a map where it doesn't care if the result that we get from the database
is sorted or not.
- Added unit test.
2024-11-16 15:59:02 +01:00
Earl Warren
969a6ab24a
chore(release-notes): notes for the week 2024-46 weekly cherry pick
2024-11-16 15:25:37 +01:00
Gusted
7d59060dc6
bug: correctly generate oauth2 jwt signing key
...
- When RS256, RS384, ES384, ES512 was specified as the JWT signing
algorithm they would generate RS512 and ES256 respectively.
- Added unit test.
2024-11-16 15:17:19 +01:00
silverwind
308812a82e
Fix mermaid diagram height when initially hidden ( #32457 )
...
In a hidden iframe, `document.body.clientHeight` is not reliable. Use
`IntersectionObserver` to detect the visibility change and update the
height there.
Fixes: https://github.com/go-gitea/gitea/issues/32392
<img width="885" alt="image"
src="https://github.com/user-attachments/assets/a95ef6aa-27e7-443f-9d06-400ef27919ae ">
(cherry picked from commit b55a31eb6a894feb5508e350ff5e9548b2531bd6)
2024-11-16 15:12:25 +01:00
Zettat123
fc26becba4
Fix broken releases when re-pushing tags ( #32435 )
...
Fix #32427
(cherry picked from commit 35bcd667b23de29a7b0d0bf1090fb10961d3aca3)
Conflicts:
- tests/integration/repo_tag_test.go
Resolved by manually copying the added test, and also manually
adjusting the imported Go modules.
2024-11-16 15:12:25 +01:00
