Earl Warren
57cde25958
Merge pull request 'Backport translations update from Weblate ( #3359 )' ( #3497 ) from 0ko/forgejo:i18n-backport-20240427 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3497
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-27 19:52:15 +00:00
Codeberg Translate
79a214668c
[I18N] Translations update from Weblate ( #3359 )
...
Translations update from [Weblate](https://translate.codeberg.org ) for [Forgejo/forgejo](https://translate.codeberg.org/projects/forgejo/forgejo/ ).
Current translation status:
Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: Dirk <Dirk@users.noreply.translate.codeberg.org>
Co-authored-by: Salif Mehmed <mail@salif.eu>
Co-authored-by: Kita Ikuyo <searinminecraft@courvix.com>
Co-authored-by: leana8959 <leana8959@users.noreply.translate.codeberg.org>
Co-authored-by: yeziruo <yeziruo@users.noreply.translate.codeberg.org>
Co-authored-by: SteffoSpieler <SteffoSpieler@users.noreply.translate.codeberg.org>
Co-authored-by: Mylloon <Mylloon@users.noreply.translate.codeberg.org>
Co-authored-by: lucasmz <lucasmz@users.noreply.translate.codeberg.org>
Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org>
Co-authored-by: FunctionalHacker <FunctionalHacker@users.noreply.translate.codeberg.org>
Co-authored-by: owofied <furry@users.noreply.translate.codeberg.org>
Co-authored-by: Xinayder <Xinayder@users.noreply.translate.codeberg.org>
Co-authored-by: kecrily <kecrily@users.noreply.translate.codeberg.org>
Co-authored-by: ZilloweZ <ZilloweZ@users.noreply.translate.codeberg.org>
Co-authored-by: toasterbirb <toasterbirb@users.noreply.translate.codeberg.org>
Co-authored-by: Pi-Cla <Pi-Cla@users.noreply.translate.codeberg.org>
Co-authored-by: sinsky <sinsky@users.noreply.translate.codeberg.org>
Co-authored-by: kdh8219 <kdh8219@users.noreply.translate.codeberg.org>
Co-authored-by: 747 <747@users.noreply.translate.codeberg.org>
Co-authored-by: Quitaxd <Quitaxd@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3359
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-04-27 21:40:53 +05:00
Earl Warren
35790985d2
Merge pull request '[v1.22/gitea] week 2024-18 cherry pick v7.0' ( #3483 ) from earl-warren/forgejo:wip-v7.0-gitea-cherry-pick into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3483
Reviewed-by: Gergely Nagy <algernon@noreply.codeberg.org>
2024-04-27 10:13:24 +00:00
Earl Warren
554f3697fc
Merge pull request '[v7.0/forgejo] docs(release-notes): 7.0.1' ( #3489 ) from bp-v7.0/forgejo-a5df622 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3489
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-27 04:49:54 +00:00
Earl Warren
5793e8687f
docs(release-notes): 7.0.1
...
(cherry picked from commit a5df622099
2024-04-26 22:44:03 +00:00
Lunny Xiao
5fc96c0356
Fix wrong table name ( #30557 ) ( #30651 )
...
Backport #30557
The table name should be `oauth2_application` but `o_auth2_application`
Caused by
https://github.com/go-gitea/gitea/pull/21316/files#diff-9610efbc608a41f1f2eaff5790423f0a187906f6ff0beb23a5e8d18366cc2ccfR38
(cherry picked from commit 5c12e794455fc2378d034addd9ee3581b55e6709)
2024-04-26 14:39:47 +02:00
Earl Warren
af372ba127
Merge pull request '[v7.0/forgejo] fix: git.ComputeHash did not consider the content' ( #3481 ) from bp-v7.0/forgejo-5247fd5-3dfa5ba into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3481
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
2024-04-26 11:27:52 +00:00
Earl Warren
4288238b1e
Merge pull request '[v7.0/forgejo] fix(lfs): gogit /settings/lfs/find 500 error' ( #3479 ) from bp-v7.0/forgejo-c31ae1a into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3479
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-26 11:01:07 +00:00
oliverpool
fd59a255e6
fix: git.ComputeHash did not write the content
...
(cherry picked from commit 5247fd50db
2024-04-26 10:27:01 +00:00
oliverpool
a7570ce5ac
test: LFS gc should not delete all metadata objects
...
and ComputeBlobHash should depend on the blob content (not only the
length)
(cherry picked from commit 3dfa5ba43a
2024-04-26 10:27:01 +00:00
Earl Warren
8e304659c5
Merge pull request '[v7.0/forgejo] services/convert: Convert a Repository's ObjectFormatName too' ( #3478 ) from bp-v7.0/forgejo-2385f3c into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3478
Reviewed-by: Gergely Nagy <algernon@noreply.codeberg.org>
2024-04-26 10:07:58 +00:00
Earl Warren
e072201830
fix(lfs): gogit /settings/lfs/find 500 error ( #3472 )
...
Refs: https://codeberg.org/forgejo/forgejo/pulls/3448
Refs: https://codeberg.org/forgejo/forgejo/issues/3438
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3472
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
Co-authored-by: Earl Warren <contact@earl-warren.org>
Co-committed-by: Earl Warren <contact@earl-warren.org>
(cherry picked from commit c31ae1a651
2024-04-26 09:48:22 +00:00
Earl Warren
d58b74d368
Merge pull request '[v7.0/forgejo] [FIX] Set max fuzziness to 2 for bleve' ( #3477 ) from bp-v7.0/forgejo-a641ebf into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3477
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-26 09:36:09 +00:00
Gergely Nagy
9860af7f39
services/convert: Convert a Repository's ObjectFormatName too
...
When converting a `repo_model.Repository` to `api.Repository`, copy the
`ObjectFormatName` field too.
Fixes #3458 .
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
(cherry picked from commit 2385f3c9db
2024-04-26 08:55:40 +00:00
Shiny Nematoda
966975a3e0
[FIX] Set max fuzziness to 2 for bleve ( #3444 )
...
closes #3443
regression from ab5f0b7558https://codeberg.org/forgejo/forgejo/pulls/3444
Reviewed-by: Otto <otto@codeberg.org>
Co-authored-by: Shiny Nematoda <snematoda.751k2@aleeas.com>
Co-committed-by: Shiny Nematoda <snematoda.751k2@aleeas.com>
(cherry picked from commit a641ebf221
2024-04-26 08:29:21 +00:00
Earl Warren
9cd8cd4874
Merge pull request '[v7.0/forgejo] docs: contributing: avoid information duplication' ( #3457 ) from bp-v7.0/forgejo-ad9872d into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3457
Reviewed-by: Otto <otto@codeberg.org>
2024-04-26 06:55:37 +00:00
Earl Warren
1040683676
Merge pull request 'docs(release-notes): 7.0.0 LFS garbage collection and workaround' ( #3471 ) from earl-warren/forgejo:wip-release-notes-v7.0.1 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3471
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
2024-04-26 06:44:51 +00:00
Earl Warren
a37836f228
docs(release-notes): 7.0.0 LFS garbage collection and workaround
...
Refs: https://codeberg.org/forgejo/forgejo/issues/3438
2024-04-26 08:09:04 +02:00
Earl Warren
5083ea72fb
[v7.0/forgejo] fix(ui): /settings/lfs/find 500 error ( #3451 )
...
When in the repository settings, visiting
- `LFS` to `/{owner}/{repo}/settings/lfs`
- `Find pointer files` to `/{owner}/{repo}/settings/lfs/pointers`
- `Find commits` to `/{owner}/{repo}/settings/lfs/find?oid=...`
failed with an error 500 because of an incorrect evaluation of the
template.
Regression introduced by
cbf923e87bhttps://codeberg.org/forgejo/forgejo/issues/3438
(cherry picked from commit 078229a5e4https://codeberg.org/forgejo/forgejo/pulls/3465/files to ensure the test fails.
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3451
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
Co-authored-by: Earl Warren <contact@earl-warren.org>
Co-committed-by: Earl Warren <contact@earl-warren.org>
2024-04-25 21:46:25 +00:00
Nicolas CARPi
f2628f91fe
docs: contributing: avoid information duplication ( #3454 )
...
The file CONTRIBUTING.md contains a list of links that points to
different parts of the developer documentation.
Unfortunately, this list is now incomplete and contains a dead link for the
Developer Workflow.
Given that a more complete similar list is present at:
https://forgejo.org/docs/latest/developer/ , this patch removes the
duplication of information, which leads to dead links and
maintenance burden, and replaces the list with simply a link to the page
that has all the current links.
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3454
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: Nicolas CARPi <nico-git@deltablot.email>
Co-committed-by: Nicolas CARPi <nico-git@deltablot.email>
(cherry picked from commit ad9872d884
2024-04-25 19:13:36 +00:00
Earl Warren
5f0ae00efc
Merge pull request '[v7.0/forgejo] Fix Repository icon, name and label not centered vertically' ( #3453 ) from bp-v7.0/forgejo-a278e92 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3453
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-25 17:15:20 +00:00
Beowulf
cbc9567f1d
Fix Repository icon, name and label not centered vertically
...
Readded correct tailwind class for vertical centering
Regression introduced by 65e190ae8bFixes #3428 .
(cherry picked from commit a278e925a1
2024-04-25 16:23:36 +00:00
Earl Warren
7e3ff68ba9
Merge pull request '[v7.0/forgejo] fix(cli): admin user create first user never require a password change' ( #3435 ) from bp-v7.0/forgejo-ec33423-b9424e6-eb74846 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3435
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-24 23:19:39 +00:00
Earl Warren
a1f29d9a0e
fix(cli): admin user create first user never require a password change
...
Fixes: https://codeberg.org/forgejo/forgejo/issues/3399
(cherry picked from commit ec334239e0
2024-04-24 22:26:37 +00:00
Earl Warren
21a853aac7
test(cli): admin user change-password --must-change-password
...
(cherry picked from commit b9424e634f
2024-04-24 22:26:37 +00:00
Earl Warren
8b4ca4501a
test(cli): admin user create and must change password value
...
(cherry picked from commit eb74846d7d
2024-04-24 22:26:37 +00:00
Earl Warren
c932519946
Merge pull request '[v7.0/forgejo] fix(docs): v7.0.0 admin user create regression (take2)' ( #3420 ) from bp-v7.0/forgejo-b127b24 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3420
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-24 22:06:46 +00:00
0ko
b248181a99
Merge pull request '[v7.0/forgejo] UI: fix rounding of vertical menus on /issues, /pulls' ( #3422 ) from bp-v7.0/forgejo-0956415 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3422
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
2024-04-24 18:44:39 +00:00
0ko
87545c721b
UI: fix rounding of vertical menus on /issues, /pulls
...
(cherry picked from commit 0956415707
2024-04-24 15:39:52 +00:00
Earl Warren
b47f7a80cf
fix(docs): v7.0.0 admin user create regression (take2)
...
The scope of the regression is limited to the first created user when
it is not an admin.
Refs: https://codeberg.org/forgejo/forgejo/issues/3399
(cherry picked from commit b127b24f02
2024-04-24 15:05:42 +00:00
Earl Warren
d01fc3e2f5
Merge pull request '[v7.0/forgejo] fix(docs): v7.0.0 admin user create regression' ( #3417 ) from bp-v7.0/forgejo-4b57362 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3417
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-24 15:04:12 +00:00
Earl Warren
bdfca7c00d
fix(docs): v7.0.0 admin user create regression
...
The tests in Forgejo extensively rely on admin user create to create
the first admin user. This regression was not noticed because it
is an exception and a password change will not be required.
Refs: https://codeberg.org/forgejo/forgejo/issues/3399
(cherry picked from commit 4b57362056
2024-04-24 14:05:12 +00:00
Earl Warren
f341942feb
Merge pull request '[v7.0/forgejo] feat(docs): 7.0.1 release notes template' ( #3408 ) from bp-v7.0/forgejo-a760278 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3408
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-24 08:18:47 +00:00
Earl Warren
85a73553c9
feat(docs): 7.0.1 release notes template
...
so that individual commits can include additions to the release notes
when relevant.
(cherry picked from commit a7602781c4
2024-04-24 07:26:20 +00:00
Earl Warren
a134c0f172
Merge pull request 'fix(docs): backport v7.0.0 release notes' ( #3405 ) from earl-warren/forgejo:wip-release-notes-v7.0.1 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3405
2024-04-24 07:17:11 +00:00
Earl Warren
f5d9d8cbd4
fix(docs): backport v7.0.0 release notes
...
The v7.0 branch should have the v7.0 release notes.
2024-04-24 08:24:28 +02:00
Earl Warren
73c190af4c
Merge pull request '[v7.0/forgejo] Fix the WIP prefix toggling on the sidebar' ( #3390 ) from bp-v7.0/forgejo-a93a99e into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3390
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-23 08:42:03 +00:00
Gergely Nagy
e947fa7acc
Fix the WIP prefix toggling on the sidebar
...
The WIP prefix toggling link on the sidebar only supported toggling
the *first* prefix specified in
`[repository.pullrequest].WORK_IN_PROGRESS_PREFIXES`. If the pull
request had a title with any other prefix, the first prefix listed in
the config was added (and then removed on toggling it off).
This little change makes all of the prefixes available for the
JavaScript function that does the toggling, and changes said function to
find the used prefix first, and toggle that.
When adding the prefix, it will still default to adding the first one
listed in the configuration, but it will happily remove any others if
those are present.
Fixes #3377 .
Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
(cherry picked from commit a93a99eef3
2024-04-23 08:01:58 +00:00
Earl Warren
bbd204c30c
Merge pull request '[v7.0/forgejo] fix(incoming): allow replies to comments' ( #3382 ) from bp-v7.0/forgejo-5428531 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3382
2024-04-22 23:46:52 +00:00
Earl Warren
f58e0d8617
fix(incoming): allow replies to comments
...
- allow attachments to code comments
- incoming mails from issue comments are now identified as comments
Fixes: https://codeberg.org/forgejo/forgejo/issues/3374
(cherry picked from commit 54285319f6
2024-04-22 22:43:16 +00:00
Earl Warren
9eaabc077a
Merge pull request '[v7.0/forgejo] Fix dropdown text ellipsis ( #30628 ) ( #30633 )' ( #3373 ) from bp-v7.0/forgejo-112df5a into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3373
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-22 20:12:25 +00:00
wxiaoguang
196cef0221
Fix dropdown text ellipsis ( #30628 )
...
Follow
https://github.com/go-gitea/gitea/pull/30547#discussion_r1573866519
Fix #30624
The Fomantic UI Dropdown wasn't designed to work that way, its "text"
element might contain images. So the "overflow" shouldn't be added to
any general dropdown text.
(cherry picked from commit 1e4867730b261352d63098b85cf53ca05867c8c2)
(cherry picked from commit 112df5a3fe
2024-04-22 19:31:26 +00:00
Earl Warren
8859a7f1a7
Merge pull request '[v7.0/forgejo] Accessibility improvements to code review' ( #3368 ) from bp-v7.0/forgejo-87d4746-187e10d into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3368
Reviewed-by: Otto <otto@codeberg.org>
2024-04-22 17:00:42 +00:00
Earl Warren
7316f23265
Merge pull request '[v7.0/forgejo] s/Gitea/Forgejo in various log messages and comments' ( #3367 ) from bp-v7.0/forgejo-469c214 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3367
2024-04-22 15:37:10 +00:00
Otto Richter
4eefb64b12
Rename button to "Finish Review"
...
Motivation: The meaning of the button is apparent from the visual
position and the number icon. This is not exposed to a screenreader.
Naming it to "Finish Review" helps with to provide the meaning of the
button as well as the number in the label.
(cherry picked from commit 87d4746f5e
2024-04-22 14:54:19 +00:00
Otto Richter
81cc944cda
Fix unlabelled button in code review
...
(cherry picked from commit 187e10d8c9
2024-04-22 14:54:19 +00:00
0ko
c7ba51518c
s/Gitea/Forgejo in various log messages and comments
...
(cherry picked from commit 469c214ec8
2024-04-22 14:41:17 +00:00
Earl Warren
4433cd9793
Merge pull request '[v1.22/gitea] week 2024-17 cherry pick v7.0' ( #3354 ) from earl-warren/forgejo:wip-v7.0-gitea-cherry-pick into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3354
Reviewed-by: Gergely Nagy <algernon@noreply.codeberg.org>
2024-04-22 09:55:54 +00:00
Earl Warren
792764456c
Merge pull request '[v7.0/forgejo] [PORT] gitea#30546: Add form field id generation, remove duplicated ids' ( #3362 ) from bp-v7.0/forgejo-a01387f into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3362
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-04-22 08:15:26 +00:00
silverwind
2072ff75e8
Add form field id generation, remove duplicated ids ( #30546 )
...
Fixes: https://github.com/go-gitea/gitea/issues/30384
On repo settings page, there id `repo_name` was used 5 times on the same
page, some in modal and such. I think we are better off just
auto-generating these IDs in the future so that labels link up with
their form element.
Ideally this id generation would be done in backend in a subtemplate,
but seeing that we already have similar JS patches for checkboxes, I
took the easy path for now.
I also checked that these `#repo_name` were not in use in JS and the
only case where this id appears in JS is on the migration page where
it's still there.
---------
Co-authored-by: Giteabot <teabot@gitea.io>
(cherry picked from commit d4ec6b3d16496ce3b479d5a08f79823122dc2b7b)
Conflicts:
- templates/repo/settings/options.tmpl
Conflict resolved by manually removing all `id` and `for`
attributes from elements that had `repo_name` as their id.
(cherry picked from commit a01387f5b1
2024-04-22 07:46:30 +00:00
