1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-25 08:59:31 -05:00
Commit graph

20095 commits

Author SHA1 Message Date
Gusted
3962380a33 Merge pull request '[v8.0/forgejo] Don't panic on empty blockquote' (#4622) from gusted/forgejo-commit-panic-bp into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4622
Reviewed-by: twenty-panda <twenty-panda@noreply.codeberg.org>
2024-07-22 18:17:29 +00:00
Earl Warren
b4dacce654 Merge pull request '[v8.0/forgejo] fix(actions): no edited event triggered when a title is changed' (#4621) from bp-v8.0/forgejo-f6000c3 into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4621
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-07-22 12:58:47 +00:00
Gusted
bb9dcec39c
[v8.0/forgejo] Don't panic on empty blockquote
- Backport #4602
- On a empty blockquote the callout feature would panic, as it expects
to always have at least one child.
- This panic cannot result in a DoS, because any panic that happens
while rendering any markdown input will be recovered gracefully.
- Adds a simple condition to avoid this panic.

(cherry picked from commit efd63ec1d8)
2024-07-22 14:17:50 +02:00
Twenty Panda
05787c3809 fix(actions): no edited event triggered when a title is changed
When the title of an issue or a pull request is changed, the edited
event must be triggered, in the same way it is when the body of the
description is changed.

The web endpoints and the API endpoints for both pull requests and
issues rely on issue_service.ChangeTitle which calls
notify_service.IssueChangeTitle.

(cherry picked from commit f6000c3760)
2024-07-22 11:46:50 +00:00
Earl Warren
c65534ce02 Merge pull request '[v8.0/forgejo] [BUG] Fix panic on too high page number' (#4606) from bp-v8.0/forgejo-6a49e3f into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4606
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-07-21 06:58:15 +00:00
Gusted
6837da596e [BUG] Fix panic on too high page number
- Fixes a panic where the file history router would panic if the page
number was set to a page where no commits would be returned. It now
returns a 404 in such case.
- Regresion of a5b1c1b0b3
- Panic log provided by @algernon.
- Minimal integration test added.

Co-authored-by: Gergely Nagy <forgejo@gergo.csillger.hu>
(cherry picked from commit 6a49e3f468)
2024-07-21 06:00:22 +00:00
Gusted
f385c66a47 Merge pull request '[v8.0/forgejo] Remove APA as cite format' (#4601) from beowulf/v8.0/forgejo into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4601
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-07-20 18:08:16 +00:00
Beowulf
888250ea66
Remove APA as cite format
This removes APA as cite format, because it depends on an copyleft
dependency (https://github.com/Juris-M/citeproc-js).

(cherry picked from commit 7dc0b2bab6)
2024-07-20 17:58:56 +02:00
0ko
6c35127705 Merge pull request '[v8.0/forgejo] [UI] Replace vue-bar-graph with chart.js' (#4590) from gusted/forgejo-bp-licensed into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4590
Reviewed-by: Beowulf <beowulf@noreply.codeberg.org>
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-07-20 13:27:40 +00:00
Gusted
a3fc16bb03
[UI] Replace vue-bar-graph with chart.js
- Backport of #4571
- The usage of the `vue-bar-graph` is complicated, because of the `GSAP`
dependency they pull in, the dependency uses a non-free license.
- The code is rewritten to use the `chart.js` library, which is already
used to draw other charts in the activity tab. Due to the limitation of
`chart.js`, we have to create a plugin in order to have images as labels
and do click handling for those images.
- The chart isn't the same as the previous one, once again simply due to
how `chart.js` works, the amount of commits isn't drawn anymore in the
bar, you instead have to hover over it or look at the y-axis.
- Resolves #4569

(cherry picked from commit a83002679d)
2024-07-20 14:42:14 +02:00
Earl Warren
57e69e56b4 Merge pull request '[v8.0/forgejo] [BUG] Add early-return to loading items from SpecList' (#4585) from bp-v8.0/forgejo-f7dac2c into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4585
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-07-20 08:30:09 +00:00
Gusted
358be0a8dd [BUG] Add early-return to loading items from SpecList
- Add an early-return to `LoadSchedules` and `LoadRepos` of the
`SpecList` type, @Beowulf noticed that useless queries were being run
every 30 seconds. These stemmed from these two functions being run even
if there were no scheduled actions.
- No tests were added, because there is zero testing infrastructure or
fixtures for the actions specifications models. I feel these are trivial
enough to not require any tests.

(cherry picked from commit f7dac2c3d9)
2024-07-20 07:41:26 +00:00
0ko
0ed8aa276d Merge pull request '[v8/forgejo] i18n: update of translations from Weblate' (#4565) from 0ko/forgejo:i18n-backport-20240718 into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4565
Reviewed-by: twenty-panda <twenty-panda@noreply.codeberg.org>
2024-07-19 09:46:42 +00:00
Codeberg Translate
c21ca66867 [v8/forgejo] i18n: update of translations from Weblate
Translations update from [Weblate](https://translate.codeberg.org) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/).

Co-authored-by: Wuzzy <Wuzzy@users.noreply.translate.codeberg.org>
Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org>
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: manolosd <manolosd@users.noreply.translate.codeberg.org>
Co-authored-by: Nifou <Nifou@users.noreply.translate.codeberg.org>
Co-authored-by: kdh8219 <kdh8219@monamo.dev>
Co-authored-by: Kita Ikuyo <searinminecraft@courvix.com>
Co-authored-by: Anonymous <anonymous@users.noreply.translate.codeberg.org>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: ch0ccyra1n <ch0ccyra1n@users.noreply.translate.codeberg.org>
Co-authored-by: mahlzahn <mahlzahn@users.noreply.translate.codeberg.org>
Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-authored-by: Xinayder <Xinayder@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4451
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 a9d32b588a)
2024-07-18 12:48:00 +05:00
0ko
f07d1aed2e [v7/v8] i18n(*): freeze translations of register_notify (#4562)
This string has been in v9 (c773ca37ad) and now includes a template for app name instead of hardcoded software name.
v7 and v8 do not expect this string to have any templates. Prevent breaking translations by backports by freezing translations of this string for v7 and v8.

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4562
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-07-18 07:19:37 +00:00
Earl Warren
a31792b3d0 Merge pull request '[v8.0/forgejo] fix: label selector popup width (issue creation)' (#4561) from bp-v8.0/forgejo-b32a035 into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4561
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-07-18 05:33:23 +00:00
Beowulf
767560dbef Fix label selector popup width (issue creation)
This aligns the popup width of the label selector during issue creation
to the width of the label selector in an already created issue.

(The inherited width from "ui form" is reset to prevent width: 100% on the
input element in the search box.)

(cherry picked from commit b32a03531c)
2024-07-18 04:35:34 +00:00
Earl Warren
b3f60875d2 Merge pull request '[v8.0/forgejo] fix: labels set during issue creation are not displayed' (#4547) from bp-v8.0/forgejo-3269583 into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4547
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-07-17 13:33:23 +00:00
0ko
8b1027b9a9 ui: fix issue labels
(cherry picked from commit 326958316d)
2024-07-17 12:06:54 +00:00
Earl Warren
6bb8891067 Merge pull request '[v8.0/forgejo] Load attachments for /issues/comments/{id}' (#4529) from bp-v8.0/forgejo-fc4f914 into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4529
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-07-16 15:05:54 +00:00
Gergely Nagy
dc075fc1c0 Load attachments for /issues/comments/{id}
The `/repos/{owner}/{repo}/issues/comments/{id}` API endpoint returns an
`assets` field, but the route handler did not load attachments, thus,
the field was never populated.

This patch fixes that, and adds a test to exercise it. The test fails
without the fix.

This addresses a bug discovered in Codeberg/Community#1607.

Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
(cherry picked from commit fc4f914e71)
2024-07-16 12:45:20 +00:00
Earl Warren
3e7c4f7d76 Merge pull request '[v8.0/forgejo] fix(ci): use 512MB for elasticsearch instead of 32GB' (#4527) from bp-v8.0/forgejo-d1dadf4 into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4527
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-07-16 12:44:04 +00:00
Earl Warren
cb656c3309 fix(ci): use 512MB for elasticsearch instead of 32GB
It can be observed that when elasticsearch runs in the CI the process
uses 32GB of resident memory.

Set Xmx and Xms to no more than the threshold that the JVM uses for
compressed object pointers (compressed oops); the exact threshold
varies but is near 32 GB. You can verify that you are under the
threshold by looking for a line in the logs like the following:

Refs: https://www.elastic.co/guide/en/elasticsearch/reference/7.5/docker.html
Refs: https://www.elastic.co/guide/en/elasticsearch/reference/7.5/heap-size.html
(cherry picked from commit d1dadf4e06)
2024-07-16 11:01:31 +00:00
Earl Warren
75808d5ba9 Merge pull request '[v8.0/forgejo] [port] Use old behavior for telegram webhook (gitea#31588)' (#4505) from bp-v8.0/forgejo-38dce65 into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4505
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-07-14 22:50:02 +00:00
wxiaoguang
c12857d5dd Use old behavior for telegram webhook (#31588)
Fix #31182

(cherry picked from commit 43c63c33aea1b0725ed1fe7b4a55dd85050f0beb)
(cherry picked from commit 38dce65dc1)
2024-07-14 20:26:54 +00:00
Otto
4f97baaec3 Merge pull request '[v8.0/forgejo] Fix CI status link in dashboard' (#4501) from bp-v8.0/forgejo-1088c05 into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4501
Reviewed-by: Beowulf <beowulf@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
2024-07-14 19:34:44 +00:00
Beowulf
d95ce0b6fb Fixed link to commit status and tooltip on dashboard
Regression introduced by 5a18b74632

(cherry picked from commit 1088c057e0)
2024-07-14 17:39:35 +00:00
Earl Warren
96d09860bd Merge pull request '[v8.0/forgejo] tests(e2e): only run one test, not all of them each time' (#4498) from bp-v8.0/forgejo-e3665c3 into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4498
Reviewed-by: Otto <otto@codeberg.org>
2024-07-14 17:10:56 +00:00
Otto
9f7d1051a4 Merge pull request '[v8.0/forgejo] [UI] Remove unnecessary vertical space in empty labels list' (#4495) from bp-v8.0/forgejo-013b89e into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4495
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
2024-07-14 16:17:09 +00:00
Earl Warren
f3c22b5be1 tests(e2e): only run one test, not all of them each time
(cherry picked from commit e3665c3042)
2024-07-14 15:32:18 +00:00
Gusted
5709359d55 [UI] Remove unnecessary vertical space in empty labels list
- Don't show the labels-list element, if no labels are selected.
- The labels-list was taking up vertical space, even if no labels were
selected which caused an inconsistency in how the sidebar looked.
- Adds integration test

(cherry picked from commit 013b89eb13)
2024-07-14 14:41:03 +00:00
Earl Warren
c5f84e4a93 Merge pull request '[v8.0/forgejo] Fix AGit pull request instructions' (#4479) from bp-v8.0/forgejo-0a5fa31 into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4479
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-07-13 22:09:56 +00:00
Beowulf
cb297a6f6f Fix AGit checkout instruction
The checkout instruction for pull requests created with the AGit
workflow where incorrect.

(cherry picked from commit 0a5fa31edb)
2024-07-13 18:28:14 +00:00
Earl Warren
c304a16cf8 Merge pull request '[v8.0/forgejo] Fix: Name conan remote forgejo' (#4465) from bp-v8.0/forgejo-6efaf15 into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4465
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-07-12 14:44:04 +00:00
Kwonunn
47d6edab16 Fix: Name conan remote forgejo
(cherry picked from commit 6efaf155d9)
2024-07-12 13:28:33 +00:00
forgejo-backport-action
ab23e0159b [v8.0/forgejo] Improvements to English locale (#4460)
**Backport:** https://codeberg.org/forgejo/forgejo/pulls/4453

A few fixes and improvements.

Notable changes:

- `issues.ref_closing_from` now makes sense.
https://codeberg.org/attachments/c091cc42-f0bf-4a14-8e43-8c66ead5ef06

- `pulls.cmd_instruction_hint`: removed full stop.
https://codeberg.org/attachments/41fcf979-3a5b-48f8-9e60-bde0b06dd522

- `settings.wiki_rename_branch_main_desc`: fix based on change in stalled 3546 so the sentence makes sense.

- `find_file.go_to_file`: better describe what the button does
https://codeberg.org/attachments/e181e486-3376-446d-a994-bfe65c125a70

- `repos.unadopted.no_more`: it's also shown when there are no results, not when the server "ran out of results"
https://codeberg.org/attachments/9077cbc4-f9e7-4ee5-ad86-6cfff41fec37

- `security.txt`: rephrase to decrease brokenness of English.

- `translation_meta`: added a special string, can be used to trigger Weblate to create a PR, which is usable for debugging

Co-authors:
- https://codeberg.org/Cyborus
- https://codeberg.org/toolforger
- https://codeberg.org/woutput

Co-authored-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4460
Co-authored-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
Co-committed-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
2024-07-12 13:09:13 +00:00
Earl Warren
93e6b7c3f9 Merge pull request 'Lock file maintenance (v8.0/forgejo)' (#4446) from renovate/v8.0/forgejo-lock-file-maintenance into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4446
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-07-11 08:48:36 +00:00
Renovate Bot
e4c640a275 Lock file maintenance 2024-07-11 08:08:39 +00:00
Earl Warren
15606b1e1a Merge pull request '[v8.0/forgejo] i18n: update of translations from Weblate' (#4445) from bp-v8.0/forgejo-78c5e0b into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4445
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-07-11 07:53:52 +00:00
Codeberg Translate
6f7c191c70 i18n: update of translations from Weblate (#4330)
Translations update from [Weblate](https://translate.codeberg.org) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/).

Current translation status:

![Weblate translation status](https://translate.codeberg.org/widget/forgejo/forgejo/horizontal-auto.svg)

Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: leana8959 <leana8959@users.noreply.translate.codeberg.org>
Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org>
Co-authored-by: Salif Mehmed <mail@salif.eu>
Co-authored-by: Zughy <Zughy@users.noreply.translate.codeberg.org>
Co-authored-by: EssGeeEich <EssGeeEich@users.noreply.translate.codeberg.org>
Co-authored-by: Fjuro <fjuro@alius.cz>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4330
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 78c5e0b56c)
2024-07-11 06:38:53 +00:00
Earl Warren
b755fe8473 Merge pull request '[v8.0/forgejo] Improve button gap consistency in repos' (#4397) from bp-v8.0/forgejo-c19222b into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4397
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-07-10 05:22:24 +00:00
Earl Warren
4493d0dbb4 Merge pull request '[v8.0/forgejo] [accessibility] Anchor elements' missing href added' (#4423) from bp-v8.0/forgejo-0996828 into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4423
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-07-09 12:25:05 +00:00
Earl Warren
2339bfa0a0 Merge pull request '[v8.0/forgejo] Fix branch selector in commit graph' (#4413) from bp-v8.0/forgejo-11ff38d into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4413
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Beowulf <beowulf@noreply.codeberg.org>
2024-07-09 12:08:49 +00:00
Earl Warren
ea9d80ed36 Merge pull request '[v8.0/forgejo] tests: run JavaScript tests when web_src/js is modified' (#4426) from bp-v8.0/forgejo-a6a64f1 into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4426
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-07-08 19:35:10 +00:00
Earl Warren
562b6b605e tests: run JavaScript tests when web_src/js is modified
otherwise they are not useful

(cherry picked from commit a6a64f1fdc)
2024-07-08 18:58:33 +00:00
0ko
c521e46d24 Merge pull request '[v8.0/forgejo] [BUG] Fix mobile UI for organisation creation' (#4402) from bp-v8.0/forgejo-610487e into v8.0/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4402
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-07-08 18:40:57 +00:00
banaanihillo
9024b98b3f accessibility: anchor elements' missing href added (#4375)
Add an empty hash `href="#"` attribute to anchors that did not yet have any `href` attribute, as a quick work-around to make those elements possible to interact with via keyboard. See discussion on linked issue (https://codeberg.org/forgejo/forgejo/issues/4273) for more information on how the button-like elements like this could eventually be improved even more.

Fixes https://codeberg.org/forgejo/forgejo/issues/4273.

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4375
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Co-authored-by: banaanihillo <banaanihillo@noreply.codeberg.org>
Co-committed-by: banaanihillo <banaanihillo@noreply.codeberg.org>
(cherry picked from commit 099682892b)
2024-07-08 17:37:42 +00:00
Beowulf
3fdf2e691c fix branch selector in commit graph
Regression from 5ef80ceb64

(cherry picked from commit 11ff38dd40)
2024-07-08 11:22:31 +00:00
Gusted
0700dde04e [BUG] Fix mobile UI for organisation creation
- Don't make checkpoints or radio inputs full width on a small screen,
these obviously shouldn't try to take up the whole width of a container.
- Wrap the label for organisation permission box inside a `<span
class="inline field">`, so it gets a left-margin from the `.inline.field
> :first-child` selector. This make the checkboxes and radio buttons
groups look indented from the left.
- Resolves #4361

(cherry picked from commit 610487eb83)
2024-07-07 19:32:50 +00:00
0ko
64462a6980 ui: improve button gap consistency in repos (#4365)
Improve UI in a few areas in a similar way to dc0d3a40ab. Ensure consistent 0.5em gaps in button rows, make buttons have more consistent horizontal paddings for better clickability.

Preview:
https://codeberg.org/attachments/cfca200a-3b68-4ba8-9876-75cea7822a00
https://codeberg.org/attachments/aaa5d387-919b-45af-8854-6d0f5273125f
https://codeberg.org/attachments/989225b7-b1dd-491d-bf76-7e4a962ea54e

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4365
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
(cherry picked from commit c19222b22f)
2024-07-07 15:29:50 +00:00