Earl Warren
014367158f
Merge pull request 'Update module code.forgejo.org/forgejo/act to v1.21.2 (v8.0/forgejo)' ( #5091 ) from renovate/v8.0/forgejo-code.forgejo.org-forgejo-act-1.x into v8.0/forgejo
...
/ release (push) Has been cancelled
testing / backend-checks (push) Has been cancelled
testing / frontend-checks (push) Has been cancelled
testing / test-sqlite (push) Has been cancelled
testing / security-check (push) Has been cancelled
testing / test-unit (push) Has been cancelled
testing / test-remote-cacher (map[image:ghcr.io/microsoft/garnet-alpine:1.0.14 port:6379]) (push) Has been cancelled
testing / test-remote-cacher (map[image:redis:7.2 port:6379]) (push) Has been cancelled
testing / test-remote-cacher (map[image:registry.redict.io/redict:7.3.0-scratch port:6379]) (push) Has been cancelled
testing / test-mysql (push) Has been cancelled
testing / test-pgsql (push) Has been cancelled
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5091
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-08-24 06:27:29 +00:00
Renovate Bot
92cacdcdf8
Update module code.forgejo.org/forgejo/act to v1.21.2
2024-08-24 05:44:23 +00:00
Earl Warren
631d49e243
Merge pull request '[v8.0/forgejo] chore(dependency): use forgejo/act instead of gitea/act' ( #5080 ) from earl-warren/forgejo:wip-v8.0-act into v8.0/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-remote-cacher (map[image:ghcr.io/microsoft/garnet-alpine:1.0.14 port:6379]) (push) Blocked by required conditions
testing / test-remote-cacher (map[image:redis:7.2 port:6379]) (push) Blocked by required conditions
testing / test-remote-cacher (map[image:registry.redict.io/redict:7.3.0-scratch port:6379]) (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/5080
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-08-23 07:01:26 +00:00
Earl Warren
cc4c430adc
chore(dependency): use forgejo/act instead of gitea/act
...
The subset of ACT used by Forgejo was the same as Gitea until
https://code.forgejo.org/forgejo/act/pulls/45 . Since it is now
different, use the Forgejo soft-fork instead of the Gitea soft-fork.
Refs: https://codeberg.org/forgejo/forgejo/issues/4789
(cherry picked from commit 41d13ee44b
2024-08-23 08:21:14 +02:00
Otto
47bd4727bc
Merge pull request '[PORT] Fix automerge on AGit PRs (gitea#31881)' ( #5053 ) from gusted/forgejo-bp-gt-31881 into v8.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5053
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Reviewed-by: Otto <otto@codeberg.org>
2024-08-21 18:35:27 +00:00
Earl Warren
60d518e733
Merge pull request '[v8.0/forgejo] [gitea] week 2024-34 cherry pick (gitea/main -> forgejo)' ( #5050 ) from bp-v8.0/forgejo-0fd2254-a8e25e9-1dfa115-385718d-d550042-ebfdc65-7f1db1d into v8.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5050
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-08-21 15:08:29 +00:00
Giteabot
75fd8f6445
[PORT] Fix agit automerge (gitea#31881)
...
Backport https://github.com/go-gitea/gitea/pull/31207 by @lunny
Fix https://github.com/go-gitea/gitea/issues/31134
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
---
Conflict resolution: none
Modification: `s/assert.NoError/require.NoError`
(cherry picked from commit a0d1630700073785baff4ebc3031b0480d44cc63)
2024-08-21 17:05:34 +02:00
Earl Warren
4e5774fef7
chore(release-notes): weekly cherry-pick week 2024-34-v8.0
2024-08-21 13:06:07 +02:00
yp05327
c5acd41146
Add missing repository type filter parameters to pager ( #31832 )
...
Fix #31807
ps: the newly added params's value will be changed.
When the first time you selected the filter, the values of params will
be `0` or `1`
But in pager it will be `true` or `false`.
So do we have `boolToInt` function?
(cherry picked from commit 7092402a2db255ecde2c20574b973fb632c16d2e)
Conflicts:
routers/web/org/home.go
trivial conflict s/pager.AddParam/pager.AddParamString/
(cherry picked from commit a8e25e907c
2024-08-21 13:03:36 +02:00
Adrian Hirt
9a142e3fd1
Fix overflowing content in action run log ( #31842 )
...
When a long line with characters such as dots is returned by a step in
an action (e.g. by the output of the Ruby on Rails test runner), it
overflows the log container, causing the page to scroll sideways.
This PR adds the CSS `overflow-wrap: anywhere;` to the
`.job-step-section .job-step-logs .job-log-line .log-msg` selector,
which causes such lines to wrap as well
(cherry picked from commit 61aaf3440142d225802e3e9ce3db28bcf71f5a7e)
(cherry picked from commit 1dfa11551c
2024-08-21 13:03:36 +02:00
Jason Song
d5fec46de7
Avoid returning without written ctx when posting PR ( #31843 )
...
Fix #31625 .
If `pull_service.NewPullRequest` return an error which misses each `if`
check, `CompareAndPullRequestPost` will return immediately, since it
doesn't write the HTTP response, a 200 response with empty body will be
sent to clients.
```go
if err := pull_service.NewPullRequest(ctx, repo, pullIssue, labelIDs, attachments, pullRequest, assigneeIDs); err != nil {
if repo_model.IsErrUserDoesNotHaveAccessToRepo(err) {
ctx.Error(http.StatusBadRequest, "UserDoesNotHaveAccessToRepo", err.Error())
} else if git.IsErrPushRejected(err) {
// ...
ctx.JSONError(flashError)
} else if errors.Is(err, user_model.ErrBlockedUser) {
// ...
ctx.JSONError(flashError)
} else if errors.Is(err, issues_model.ErrMustCollaborator) {
// ...
ctx.JSONError(flashError)
}
return
}
```
Not sure what kind of error can cause it to happen, so this PR just
expose it. And we can fix it when users report that creating PRs failed
with error responses.
It's all my guess since I cannot reproduce the problem, but even if it's
not related, the code here needs to be improved.
(cherry picked from commit acd7053e9d4968e8b9812ab379be9027ac8e7771)
Conflicts:
routers/web/repo/pull.go
trivial context conflict
(cherry picked from commit 385718dd78
2024-08-21 13:03:36 +02:00
Lunny Xiao
e442e71e03
Fix panic of ssh public key page after deletion of auth source ( #31829 )
...
Fix #31730
This PR rewrote the function `PublicKeysAreExternallyManaged` with a
simple test. The new function removed the loop to make it more readable.
(cherry picked from commit b491b2104f83ee8fc4956c099c427b339291b3be)
(cherry picked from commit d5500422c9
2024-08-21 13:03:36 +02:00
Jason Song
cd7d0166f2
Show lock owner instead of repo owner on LFS setting page ( #31788 )
...
Fix #31784 .
Before:
<img width="1648" alt="image"
src="https://github.com/user-attachments/assets/03f32545-4a85-42ed-bafc-2b193a5d8023 ">
After:
<img width="1653" alt="image"
src="https://github.com/user-attachments/assets/e5bcaf93-49cb-421f-aac1-5122bc488b02 ">
(cherry picked from commit 0470646d46f90c20f40fde718be6ef8d8c84ee2c)
(cherry picked from commit 7f1db1df3e
2024-08-21 10:57:57 +00:00
Otto
e3afdb8bc7
Merge pull request '[PORT] Fix overflow for images on project cards (gitea#31683)' ( #5032 ) from gusted/forgejo-bp-5029 into v8.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5032
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
2024-08-20 17:46:09 +00:00
Gusted
4b4613bd9c
[UI] Remove snapping for images on project cards
...
Remove the snapping of the images on the projects cards, the images are
way too small to notice that when scrolling you're being snapped to
these images and when you do notice it, it doesn't make sense as you
wouldn't expect it to be snapped.
(cherry picked from commit 0764b7c18b
2024-08-20 18:13:54 +02:00
Simon Priet
e827bfa88a
[PORT] Scroll images in project issues separately from the remaining issue (gitea#31683)
...
As discussed in https://github.com/go-gitea/gitea/issues/31667 &
https://github.com/go-gitea/gitea/issues/26561 , when a card on a Project
contains images, they can overflow the card on its containing column.
This aims to fix this issue via snapping scrollbars.
---
Conflict resolution: none
(cherry picked from commit fe7c9416777243264e8482d3af29e30c2b671074)
(cherry picked from commit 8e46efef95
2024-08-20 18:13:54 +02:00
Otto
292df29f42
Merge pull request '[v8.0/forgejo] [UI] Adjust trailing EOL behavior for empty file' ( #5028 ) from bp-v8.0/forgejo-e9a89a1 into v8.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5028
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-08-20 14:33:59 +00:00
Gusted
69dfe81d0e
[UI] Adjust trailing EOL behavior for empty file
...
- Follow up #4835
- Currently for empty files (file size is shown in the file header) the
"No EOL" information is being shown, even though it doesn't really
make sense to show that for empty files.
- Add integration test.
- Ref: https://codeberg.org/Codeberg/Community/issues/1612#issuecomment-2169437
(cherry picked from commit e9a89a188e
2024-08-20 13:42:33 +00:00
Gusted
05af474e7a
Merge pull request '[v8.0/forgejo] [UI] Fix misalignment of authors for repo acctivity' ( #5006 ) from bp-v8.0/forgejo-72f4130 into v8.0/forgejo
...
/ release (push) Has been cancelled
testing / backend-checks (push) Has been cancelled
testing / frontend-checks (push) Has been cancelled
testing / test-unit (push) Has been cancelled
testing / test-remote-cacher (map[image:ghcr.io/microsoft/garnet-alpine:1.0.14 port:6379]) (push) Has been cancelled
testing / test-remote-cacher (map[image:redis:7.2 port:6379]) (push) Has been cancelled
testing / test-remote-cacher (map[image:registry.redict.io/redict:7.3.0-scratch port:6379]) (push) Has been cancelled
testing / test-mysql (push) Has been cancelled
testing / test-pgsql (push) Has been cancelled
testing / test-sqlite (push) Has been cancelled
testing / security-check (push) Has been cancelled
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5006
Reviewed-by: Otto <otto@codeberg.org>
2024-08-18 21:06:22 +00:00
Gusted
50db6ef5df
[UI] Fix misalignment of authors for repo acctivity
...
- Regression of #4571
- We aren't showing the ticks generated by chartjs, because we want to
show the avatar of the person instead. You can't *realy* disable that
tick, so instead I opted to make them transparent in #4571 , however they
still affected the generation of ticks so if enough authors were being
shown, for some the ticks were being skipped. Adjust the settings to
make sure they are always being shown.
- Resolves https://codeberg.org/forgejo/forgejo/issues/4982
(cherry picked from commit 72f41306c2
2024-08-18 20:12:35 +00:00
Gusted
9d2ea1ef5d
Merge pull request '[v8.0/forgejo] [BUG] Make logout event non-blocking' ( #4981 ) from bp-v8.0/forgejo-9c5c088 into v8.0/forgejo
...
/ release (push) Has been cancelled
testing / backend-checks (push) Has been cancelled
testing / frontend-checks (push) Has been cancelled
testing / test-unit (push) Has been cancelled
testing / test-remote-cacher (map[image:ghcr.io/microsoft/garnet-alpine:1.0.14 port:6379]) (push) Has been cancelled
testing / test-remote-cacher (map[image:redis:7.2 port:6379]) (push) Has been cancelled
testing / test-remote-cacher (map[image:registry.redict.io/redict:7.3.0-scratch port:6379]) (push) Has been cancelled
testing / test-mysql (push) Has been cancelled
testing / test-pgsql (push) Has been cancelled
testing / test-sqlite (push) Has been cancelled
testing / security-check (push) Has been cancelled
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4981
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-08-16 23:22:31 +00:00
Gusted
068b80814b
[BUG] Make logout event non-blocking
...
- When people click on the logout button, a event is sent to all
browser tabs (actually to a shared worker) to notify them of this
logout. This is done in a blocking fashion, to ensure every registered
channel (which realistically should be one for every user because of the
shared worker) for a user receives this message. While doing this, it
locks the mutex for the eventsource module.
- Codeberg is currently observing a deadlock that's caused by this
blocking behavior, a channel isn't receiving the logout event. We
currently don't have a good theory of why this is being caused. This in
turn is causing that the logout functionality is no longer working and
people no longer receive notifications, unless they refresh the page.
- This patchs makes this message non-blocking and thus making it
consistent with the other messages. We don't see a good reason why this
specific event needs to be blocking and the commit introducing it
doesn't offer a rationale either.
(cherry picked from commit 9c5c08859d
2024-08-16 14:21:39 +00:00
Otto
08724823f4
Merge pull request '[v8.0/forgejo] Revert "Prevent allow/reject reviews on merged/closed PRs"' ( #4965 ) from caesar/forgejo:bp/4907 into v8.0/forgejo
...
/ release (push) Has been cancelled
testing / backend-checks (push) Has been cancelled
testing / frontend-checks (push) Has been cancelled
testing / test-unit (push) Has been cancelled
testing / test-remote-cacher (map[image:ghcr.io/microsoft/garnet-alpine:1.0.14 port:6379]) (push) Has been cancelled
testing / test-remote-cacher (map[image:redis:7.2 port:6379]) (push) Has been cancelled
testing / test-remote-cacher (map[image:registry.redict.io/redict:7.3.0-scratch port:6379]) (push) Has been cancelled
testing / test-mysql (push) Has been cancelled
testing / test-pgsql (push) Has been cancelled
testing / test-sqlite (push) Has been cancelled
testing / security-check (push) Has been cancelled
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4965
Reviewed-by: Otto <otto@codeberg.org>
2024-08-15 10:45:38 +00:00
Caesar Schinas
502948960e
add release notes
...
(cherry picked from commit 24418da690
2024-08-15 10:48:09 +01:00
Caesar Schinas
dfd3ac01d7
Revert "Prevent allow/reject reviews on merged/closed PRs"
...
This reverts commit 4ed372af13Closes forgejo/design#11
(cherry picked from commit 65c2595f26
2024-08-15 10:47:38 +01:00
Michael Kriese
35c206317b
Merge pull request '[v8.0/forgejo] fix: Run full PR checks on agit push' ( #4951 ) from bp-v8.0/forgejo-2d05e92 into v8.0/forgejo
...
testing / backend-checks (push) Has been cancelled
testing / frontend-checks (push) Has been cancelled
/ release (push) Has been cancelled
testing / test-unit (push) Has been cancelled
testing / test-remote-cacher (map[image:ghcr.io/microsoft/garnet-alpine:1.0.14 port:6379]) (push) Has been cancelled
testing / test-remote-cacher (map[image:redis:7.2 port:6379]) (push) Has been cancelled
testing / test-remote-cacher (map[image:registry.redict.io/redict:7.3.0-scratch port:6379]) (push) Has been cancelled
testing / test-mysql (push) Has been cancelled
testing / test-pgsql (push) Has been cancelled
testing / test-sqlite (push) Has been cancelled
testing / security-check (push) Has been cancelled
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4951
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-08-13 19:19:56 +00:00
Michael Kriese
f7858425bb
fix(agit): run full pr checks on force-push
...
(cherry picked from commit 2d05e922a2
2024-08-13 18:26:41 +00:00
Gusted
7b31a541c0
Merge pull request '[v8.0/forgejo] fix(ui): allow unreacting from comment popover' ( #4919 ) from bp-v8.0/forgejo-b8a5ca2 into v8.0/forgejo
...
/ release (push) Has been cancelled
testing / backend-checks (push) Has been cancelled
testing / frontend-checks (push) Has been cancelled
testing / test-unit (push) Has been cancelled
testing / test-remote-cacher (map[image:ghcr.io/microsoft/garnet-alpine:1.0.14 port:6379]) (push) Has been cancelled
testing / test-remote-cacher (map[image:redis:7.2 port:6379]) (push) Has been cancelled
testing / test-remote-cacher (map[image:registry.redict.io/redict:7.3.0-scratch port:6379]) (push) Has been cancelled
testing / test-mysql (push) Has been cancelled
testing / test-pgsql (push) Has been cancelled
testing / test-sqlite (push) Has been cancelled
testing / security-check (push) Has been cancelled
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4919
Reviewed-by: Otto <otto@codeberg.org>
2024-08-10 12:49:39 +00:00
Solomon Victorino
df2e85f667
fix(ui): allow unreacting from comment popover
...
- fix selectors for hasReacted
- don't send empty HTML on reaction errors
- add E2E test
(cherry picked from commit b8a5ca2c40
2024-08-10 09:42:40 +00:00
Earl Warren
7acc1d98d2
Merge pull request '[v8.0/forgejo] [BUG] Return blocking errors as JSON errors' ( #4918 ) from bp-v8.0/forgejo-d97cf0e into v8.0/forgejo
...
testing / test-remote-cacher (map[image:redis:7.2 port:6379]) (push) Blocked by required conditions
testing / test-remote-cacher (map[image:registry.redict.io/redict:7.3.0-scratch port:6379]) (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
/ 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-remote-cacher (map[image:ghcr.io/microsoft/garnet-alpine:1.0.14 port:6379]) (push) Blocked by required conditions
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4918
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-08-10 06:42:17 +00:00
Gusted
d9010f5cfa
[BUG] Return blocking errors as JSON errors
...
- These endspoints are since b71cb7acdcd97cf0e854
2024-08-10 05:53:07 +00:00
Gusted
4d0be867a2
Merge pull request '[v8.0/forgejo] disallow javascript: URI in the repository description' ( #4901 ) from bp-v8.0/forgejo-bb448f3 into v8.0/forgejo
...
/ release (push) Waiting to run
testing / backend-checks (push) Waiting to run
testing / test-unit (push) Blocked by required conditions
testing / test-remote-cacher (map[image:ghcr.io/microsoft/garnet-alpine:1.0.14 port:6379]) (push) Blocked by required conditions
testing / test-remote-cacher (map[image:redis:7.2 port:6379]) (push) Blocked by required conditions
testing / test-remote-cacher (map[image:registry.redict.io/redict:7.3.0-scratch port:6379]) (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
testing / frontend-checks (push) Waiting to run
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4901
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-08-09 06:59:16 +00:00
Gusted
dccf180307
disallow javascript: URI in the repository description
...
- Fixes an XSS that was introduced in
https://codeberg.org/forgejo/forgejo/pulls/1433
- This XSS allows for `href`s in anchor elements to be set to a
`javascript:` uri in the repository description, which would upon
clicking (and not upon loading) the anchor element execute the specified
javascript in that uri.
- [`AllowStandardURLs`](https://pkg.go.dev/github.com/microcosm-cc/bluemonday#Policy.AllowStandardURLs ) is now called for the repository description
policy, which ensures that URIs in anchor elements are `mailto:`,
`http://` or `https://` and thereby disallowing the `javascript:` URI.
It also now allows non-relative links and sets `rel="nofollow"` on
anchor elements.
- Unit test added.
(cherry picked from commit bb448f3dc2
2024-08-09 05:57:21 +00:00
0ko
1c0043efd6
Merge pull request 'i18n: backport of #4668 and #4783 to v8' ( #4881 ) from 0ko/forgejo:i18n-backport-20240808-v8 into v8.0/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-remote-cacher (map[image:ghcr.io/microsoft/garnet-alpine:1.0.14 port:6379]) (push) Blocked by required conditions
testing / test-remote-cacher (map[image:redis:7.2 port:6379]) (push) Blocked by required conditions
testing / test-remote-cacher (map[image:registry.redict.io/redict:7.3.0-scratch port:6379]) (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/4881
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-08-08 09:41:04 +00:00
Codeberg Translate
32cf107774
[v8.0/forgejo] i18n: update of translations from Weblate
...
Backport of https://codeberg.org/forgejo/forgejo/pulls/4783 .
Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: natalie_drowned02 <k_letovskiy02@protonmail.com>
Co-authored-by: leana8959 <leana8959@users.noreply.translate.codeberg.org>
Co-authored-by: Kita Ikuyo <searinminecraft@courvix.com>
Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org>
Co-authored-by: hugoalh <hugoalh@users.noreply.translate.codeberg.org>
Co-authored-by: hankskyjames777 <hankskyjames777@users.noreply.translate.codeberg.org>
Co-authored-by: Wuzzy <Wuzzy@users.noreply.translate.codeberg.org>
Co-authored-by: pswsm <pswsm@users.noreply.translate.codeberg.org>
Co-authored-by: dragon <dragon@users.noreply.translate.codeberg.org>
Co-authored-by: Zughy <Zughy@users.noreply.translate.codeberg.org>
Co-authored-by: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Co-authored-by: Marco Ciampa <ciampix@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4783
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>
(cherry picked from commit abc3364a7b
2024-08-08 13:08:19 +05:00
Codeberg Translate
a7e414b0f1
[v8.0/forgejo] i18n: Translations update from Weblate
...
Backport of https://codeberg.org/forgejo/forgejo/pulls/4668 .
Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org>
Co-authored-by: Wuzzy <Wuzzy@users.noreply.translate.codeberg.org>
Co-authored-by: Kita Ikuyo <searinminecraft@courvix.com>
Co-authored-by: hankskyjames777 <hankskyjames777@users.noreply.translate.codeberg.org>
Co-authored-by: mahlzahn <mahlzahn@posteo.de>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: lotigara <lotigara@users.noreply.translate.codeberg.org>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: Anonymous <anonymous@users.noreply.translate.codeberg.org>
Co-authored-by: caesar <caesar@users.noreply.translate.codeberg.org>
Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org>
Co-authored-by: Caesar Schinas <caesar@caesarschinas.com>
Co-authored-by: leana8959 <leana8959@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4668
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>
(cherry picked from commit 3d3ddd7704
2024-08-08 13:06:36 +05:00
Earl Warren
9a857d73ad
Merge pull request '[v8.0/forgejo] [BUG] Ensure all filters are persistent in issue filters' ( #4865 ) from bp-v8.0/forgejo-192177f into v8.0/forgejo
...
testing / test-pgsql (push) Has been cancelled
testing / backend-checks (push) Has been cancelled
testing / frontend-checks (push) Has been cancelled
/ release (push) Has been cancelled
testing / test-unit (push) Has been cancelled
testing / test-remote-cacher (map[image:ghcr.io/microsoft/garnet-alpine:1.0.14 port:6379]) (push) Has been cancelled
testing / test-remote-cacher (map[image:redis:7.2 port:6379]) (push) Has been cancelled
testing / test-remote-cacher (map[image:registry.redict.io/redict:7.3.0-scratch port:6379]) (push) Has been cancelled
testing / test-mysql (push) Has been cancelled
testing / test-sqlite (push) Has been cancelled
testing / security-check (push) Has been cancelled
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4865
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-08-07 06:57:13 +00:00
Earl Warren
9b1eb835c2
Merge pull request '[v8.0/forgejo] [BUG] Render references to cross-repo issues with external issues' ( #4864 ) from bp-v8.0/forgejo-05e163a into v8.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4864
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-08-07 06:32:59 +00:00
Gusted
160efced12
[BUG] Ensure all filters are persistent in issue filters
...
- Ensure that all filters are set in the issue filters links, thus
becoming persistent.
- Adds integration test
- Resolves #4843
(cherry picked from commit 192177fc88
2024-08-07 05:51:15 +00:00
Gusted
d3260fe348
[BUG] Render references to cross-repo issues with external issues
...
- If you have the external issue setting enabled, any reference would
have been rendered as an external issue, however this shouldn't be
happening to references that refer to issues in other repositories.
- Unit test added.
(cherry picked from commit 05e163aaf3
2024-08-07 05:43:24 +00:00
Gusted
055261967b
Merge pull request '[v8.0/forgejo] [UI] Do not include trailing EOL character when counting lines' ( #4848 ) from bp-v8.0/forgejo-5cf9767 into v8.0/forgejo
...
/ release (push) Waiting to run
testing / test-unit (push) Blocked by required conditions
testing / backend-checks (push) Waiting to run
testing / frontend-checks (push) Waiting to run
testing / test-remote-cacher (map[image:ghcr.io/microsoft/garnet-alpine:1.0.14 port:6379]) (push) Blocked by required conditions
testing / test-remote-cacher (map[image:redis:7.2 port:6379]) (push) Blocked by required conditions
testing / test-remote-cacher (map[image:registry.redict.io/redict:7.3.0-scratch port:6379]) (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/4848
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-08-06 13:53:47 +00:00
Gusted
56b7478b25
[UI] Do not include trailing EOL character when counting lines
...
- Adjust the counting of the number of lines of a file to match the
amount of rendered lines. This simply means that a file with the content
of `a\n` will be shown as having `1 line` rather than `2 lines`. This
matches with the amount of lines that are being rendered (the last empty
line is never rendered) and matches more with the expecation of the
user (a trailing EOL is a technical detail).
- In the case there's no EOL, the reason why it was counting
'incorrectly' was to show if there was a trailing EOL or not, but now
text is shown to tell the user this.
- Integration test added.
- Resolves Codeberg/Community#1612
(cherry picked from commit 5cf976739c
2024-08-06 12:24:38 +00:00
Gusted
04d4120adf
Merge pull request '[v8.0/forgejo] [UI] Add background to reactions on hover' ( #4847 ) from bp-v8.0/forgejo-cc11b30 into v8.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4847
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-08-06 12:22:30 +00:00
Gusted
e547439b96
[UI] Add reaction hover background color
...
- Follows 595e8abd68cc11b3027c
2024-08-06 09:54:50 +00:00
Gusted
6904b833e1
Merge pull request '[v8.0/forgejo] [BUG] Allow 4 charachter SHA in /src/commit' ( #4840 ) from bp-v8.0/forgejo-b967fce into v8.0/forgejo
...
/ release (push) Waiting to run
testing / test-remote-cacher (map[image:registry.redict.io/redict:7.3.0-scratch port:6379]) (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-remote-cacher (map[image:ghcr.io/microsoft/garnet-alpine:1.0.14 port:6379]) (push) Blocked by required conditions
testing / test-remote-cacher (map[image:redis:7.2 port:6379]) (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/4840
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-08-06 02:15:55 +00:00
Gusted
57cb5eaf41
[BUG] Allow 4 charachter SHA in /src/commit
...
- Adjust the `RepoRefByType` middleware to allow for commit SHAs that
are as short as 4 characters (the minium that Git requires).
- Integration test added.
- Follow up to 4d76bbeda7Resolves #4781
(cherry picked from commit b967fce25d
2024-08-06 01:18:48 +00:00
Earl Warren
6df8b97344
Merge pull request '[v8.0/forgejo] [CHORE] Remove SSH DSA tests' ( #4834 ) from bp-v8.0/forgejo-eb8c125 into v8.0/forgejo
...
/ release (push) Waiting to run
testing / frontend-checks (push) Waiting to run
testing / backend-checks (push) Waiting to run
testing / test-unit (push) Blocked by required conditions
testing / test-remote-cacher (map[image:ghcr.io/microsoft/garnet-alpine:1.0.14 port:6379]) (push) Blocked by required conditions
testing / test-remote-cacher (map[image:redis:7.2 port:6379]) (push) Blocked by required conditions
testing / test-remote-cacher (map[image:registry.redict.io/redict:7.3.0-scratch port:6379]) (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/4834
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-08-05 21:48:47 +00:00
Gusted
4ec8aa73b6
[CHORE] Remove SSH DSA tests
...
- Partially resolves #4659
- Fixes CI.
(cherry picked from commit eb8c125788
2024-08-05 21:04:17 +00:00
Earl Warren
b701c6f747
Merge pull request '[v8.0/forgejo] fix(ui): handle out-of-bounds end line in code selection' ( #4821 ) from bp-v8.0/forgejo-3ee5bc2 into v8.0/forgejo
...
/ release (push) Waiting to run
testing / test-remote-cacher (map[image:registry.redict.io/redict:7.3.0-scratch port:6379]) (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-remote-cacher (map[image:ghcr.io/microsoft/garnet-alpine:1.0.14 port:6379]) (push) Blocked by required conditions
testing / test-remote-cacher (map[image:redis:7.2 port:6379]) (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/4821
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-08-05 05:49:11 +00:00
Solomon Victorino
82e0be3761
fix(ui): handle out-of-bounds end line in code selection ( #4788 )
...
- fallback to the last line, preventing TypeError
- add E2E test
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4788
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Co-authored-by: Solomon Victorino <git@solomonvictorino.com>
Co-committed-by: Solomon Victorino <git@solomonvictorino.com>
(cherry picked from commit 3ee5bc262f
2024-08-05 04:45:56 +00:00
