tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1
21093 commits 11 branches 231 tags 584 MiB
Commit graph

21093 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Kriese
804051b9dd fix: typo on releases for source code downloads 
Closes #5648

(cherry picked from commit 02f8fad54d)
 2024-10-22 14:03:42 +00:00
Otto
b8ffb88d1d Merge pull request '[v9.0/forgejo] Revert "add gap between branch dropdown and PR button"' (#5645) from bp-v9.0/forgejo-04e2e15 into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5645
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
 2024-10-21 22:13:03 +00:00
Otto Richter
fd8565c91a Revert "add gap between branch dropdown and PR button" 
This change does not bring the desired benefit, because the button is
reinitialized from a Vue component once loaded, overriding this change
and causing a visual glitch upon page load (the button is moving its
position).

See the comment:

> this code must match the code in BranchTagSelector.vue

This button is also used in other places such as the release list where
the additional margin does not fit well. As such, this needs a new
solution.

This reverts commit 18cad9d342.

(cherry picked from commit 04e2e1510d)
 2024-10-21 20:44:28 +00:00
Earl Warren
c87ff7dc1d Merge pull request '[v9.0/forgejo] package arch database not updating when uploading "any" architecture' (#5636) from bp-v9.0/forgejo-95c7599 into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5636
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-10-21 06:04:38 +00:00
Earl Warren
7d3d8ef142 Merge pull request '[v9.0/forgejo] specify default value for EXPLORE_DEFAULT_SORT.' (#5629) from bp-v9.0/forgejo-f4be4e7 into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5629
Reviewed-by: Otto <otto@codeberg.org>
 2024-10-21 05:18:20 +00:00
Earl Warren
032bb17899 Merge pull request '[v9.0/forgejo] correct SQL query for active issues' (#5631) from bp-v9.0/forgejo-0055fdb into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5631
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-10-21 05:16:13 +00:00
dragon
fa307f06ac fix arch pkg 
(cherry picked from commit 95c7599db5)
 2024-10-21 05:10:13 +00:00
Gusted
d5c6036c53 fix: correct SQL query for active issues 
- The `OR` should be inside the `AND` condition to not 'bypass' the other
conditions.
- Added minimal unit test.
- Regression from 2675a24649

(cherry picked from commit 0055fdbdc4)
 2024-10-20 23:31:54 +00:00
Gusted
f3b16e1363 fix: Specify default value for EXPLORE_DEFAULT_SORT. 
- This is another regression from
5a0bc35799, where the default value was
changed to "alphabetically" because it relied on `ExploreDefaultSort`
providing a fallback value.
- Set the default value for `EXPLORE_DEFAULT_SORT` to `recentupdate`,
this was already the behavior explicitly for existing users of this setting
but with 5a0bc35799 it didn't provide a
explicit fallback to `recentupdate`. So opting for a 'easy' fix, that
doesn't add boilerplate code to those instances.

(cherry picked from commit f4be4e733c)
 2024-10-20 23:07:18 +00:00
Gusted
240fbc2661 Merge pull request '[v9.0/forgejo] fix: Add recentupdated as recognized sort option' (#5624) from bp-v9.0/forgejo-df38c41 into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5624
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-10-20 12:38:24 +00:00
Gusted
642dd61446 fix: Add recentupdated as recognized sort option 
- Add `recentupdated` to the `OrderByMap`.
- Add integration testing for organization and user repository sorting.
- Resolves #5612
- Regression from 12e23ee199 where the
`recentupdated` case was not added to the map, but was handled
seperately as a fallback. The regression came into affect when
5a0bc35799 also relied on this map but
didn't handle the `recentupdated` case.

(cherry picked from commit df38c41c7a)
 2024-10-20 10:58:07 +00:00
Otto
c7e52852bb Merge pull request '[v9.0/forgejo] fix: Don't double escape delete branch text' (#5618) from bp-v9.0/forgejo-8c8b31f into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5618
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
 2024-10-19 22:28:48 +00:00
Gusted
5d85dc2d91 fix: Don't double escape delete branch text 
- Don't double escape the 'Delete branch "$BRANCH"' text. `Locale.Tr`
escapes the argument already and Vue does too by default.
- Let Vue escape the text and add a unit test ensuring that it escapes.
- Resolves #5582

(cherry picked from commit 8c8b31f304)
 2024-10-19 21:29:27 +00:00
Gusted
b692da7f6f Merge pull request 'Update dependency mermaid to v11.3.0 (v9.0/forgejo)' (#5616) from renovate/v9.0/forgejo-mermaid-11.x into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5616
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-10-19 21:12:44 +00:00
Renovate Bot
2c5d47ec1f Update dependency mermaid to v11.3.0 2024-10-19 20:03:44 +00:00
Otto
e740aa05a4 Merge pull request '[v9.0/forgejo] fix: Add server logging for OAuth server errors' (#5596) from bp-v9.0/forgejo-a857007 into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5596
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-10-17 10:29:39 +00:00
Gusted
fb21899097 fix: Add server logging for OAuth server errors 
Although an error was presented to the user about that there's an
internal server error, the error itself is never logged.

Relevant: https://codeberg.org/Codeberg/Community/issues/1675
(cherry picked from commit a857007d65)
 2024-10-17 09:47:06 +00:00
Earl Warren
0f7020cbef Merge pull request '[v9.0/forgejo] forgejo-cli is now a symlink and cannot be used for sanity checks' (#5594) from bp-v9.0/forgejo-1a7a905-54c8ac3 into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5594
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-10-17 06:46:15 +00:00
Earl Warren
e491b05935 vars.SKIP_END_TO_END optionally skip tests when building a release 
The end-to-end tests will always fail when more than one release is
broken. When trying to fix one, the other will get in the way and vice
versa. The only way to get out of this deadlock is to replace all
broken releases but one by doing the following on forgejo-integration:

* set SKIP_END_TO_END to true in the actions vars tab
* pushing a commit to the corresponding branch, fixing the problem

(cherry picked from commit 54c8ac3e39)
 2024-10-17 06:00:05 +00:00
Earl Warren
7845659322 forgejo-cli is now a symlink and cannot be used for sanity checks 
It could be used but then `cp --dereference` would need to be used instead in
the forgejo-build-publish action.

+ docker cp forgejo-amd64:/app/gitea/forgejo-cli forgejo-9.0-test-linux-amd64
+ chmod +x forgejo-9.0-test-linux-amd64
chmod: cannot operate on dangling symlink 'forgejo-9.0-test-linux-amd64'

(cherry picked from commit 1a7a9055e4)
 2024-10-17 06:00:05 +00:00
Earl Warren
9011f73da3 Merge pull request '[v9.0/forgejo] Dockerfile: use alpine:3.20 instead of golang:1.23-alpine3.20' (#5588) from bp-v9.0/forgejo-a99bb2c into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5588
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-10-16 21:45:29 +00:00
Earl Warren
b1ffd0f58f Dockerfile: use alpine:3.20 instead of golang:1.23-alpine3.20 
Runtime does not need golang.

(cherry picked from commit a99bb2c61a)
 2024-10-16 20:45:09 +00:00
Earl Warren
f5d83f395f Merge pull request '[v9.0/forgejo] unnecessary container image layer duplication' (#5586) from bp-v9.0/forgejo-7d779a7 into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5586
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-10-16 20:34:26 +00:00
Earl Warren
348e083227 unecessary container image layer duplication 
container images grew by 100MB when

RUN ln /app/gitea/gitea /app/gitea/forgejo-cli

was added because hard links are not preserved.

Use symbolic links instead.

https://tauri.earth/@AliveDevil/113318561067465279
(cherry picked from commit 7d779a7859)
 2024-10-16 19:45:35 +00:00
Earl Warren
704910c7e9 Merge pull request '[v9.0/forgejo] fix: correct documentation for non 200 responses in swagger' (#5575) from bp-v9.0/forgejo-fcc3dd2 into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5575
Reviewed-by: Otto <otto@codeberg.org>
 2024-10-16 17:54:00 +00:00
Earl Warren
12a277ed65 Merge pull request '[v9.0/forgejo] i18n: update of translations from Codeberg Translate' (#5580) from bp-v9.0/forgejo-2f1c33b into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5580
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-10-16 03:47:57 +00:00
Codeberg Translate
e43b9edc36 i18n: update of translations from Codeberg Translate (#5555) 
Co-authored-by: Benedikt Straub <Nordfriese@users.noreply.translate.codeberg.org>
Co-authored-by: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Co-authored-by: Juno Takano <jutty@users.noreply.translate.codeberg.org>
Co-authored-by: Atul_Eterno <Atul_Eterno@users.noreply.translate.codeberg.org>
Co-authored-by: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Co-authored-by: Xinayder <Xinayder@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5555
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 2f1c33b5e0)
 2024-10-16 02:50:28 +00:00
JakobDev
acd7e57295 fix: correct documentation for non 200 responses in swagger 
(cherry picked from commit fcc3dd228d)
 2024-10-15 20:05:40 +00:00
Otto
c131de73a5 Merge pull request '[v9.0/forgejo] fix: use column flex on mobile to prevent project title from wrapping' (#5571) from bp-v9.0/forgejo-dcae7d3 into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5571
Reviewed-by: Otto <otto@codeberg.org>
 2024-10-15 19:52:50 +00:00
Michael Zhang
b8fc56885e fix: use column flex on mobile to prevent project title from wrapping 
(cherry picked from commit dcae7d368c)
 2024-10-15 11:27:04 +00:00
Earl Warren
7f4efb1c34 Merge pull request 'Update dependency go to v1.23.2 (v9.0/forgejo)' (#5570) from renovate/v9.0/forgejo-patch-golang-packages into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5570
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-10-15 03:29:07 +00:00
Renovate Bot
779ed6cf3f Update dependency go to v1.23.2 2024-10-15 00:07:24 +00:00
Otto
11bb77313e Merge pull request '[v9.0/forgejo] Fix typo in English locale file' (#5566) from bp-v9.0/forgejo-5443bca into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5566
Reviewed-by: Otto <otto@codeberg.org>
 2024-10-14 22:03:15 +00:00
jutty
c2f99a5a1f Fix typo in English locale file 
Key settings.wiki_rename_branch_main_notices_2 had a duplicated 'the'.

(cherry picked from commit 5443bca39a)
 2024-10-14 21:07:04 +00:00
Gusted
d1c4670e45 Merge pull request '[v9.0/forgejo] [BUG] Don't allow owner team with incorrect unit access (includes doctor fix)' (#5565) from bp-v9.0/forgejo-9de9034 into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5565
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-10-14 21:03:04 +00:00
Gusted
fe35a17dbe [BUG] Don't allow owner team with incorrect unit access 
- On editting a team, only update the units if the team isn't the
'Owners' team. Otherwise the 'Owners' team end up having all of their
unit access modes set to 'None'; because the request form doesn't send
over any units, as it's simply not shown in the UI.
- Adds a database inconstency check and fix for the case where the
'Owners' team is affected by this bug.
- Adds unit test.
- Adds integration test.
- Resolves #5528
- Regression of https://github.com/go-gitea/gitea/pull/24012

(cherry picked from commit 9de9034400)
 2024-10-14 19:59:17 +00:00
Otto
d66a184f45 Merge pull request '[v9.0/forgejo] Fix typo in #5537' (#5556) from bp-v9.0/forgejo-5a21ff8 into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5556
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
 2024-10-14 11:18:01 +00:00
0ko
932801ae18 i18n(en): fix typo (#5554) 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5554
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
(cherry picked from commit 5a21ff8e95)
 2024-10-14 05:21:04 +00:00
Earl Warren
d6d6561295 Merge pull request '[v9.0/forgejo] i18n: update of translations from Codeberg Translate' (#5553) from bp-v9.0/forgejo-575276c into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5553
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-10-14 04:19:04 +00:00
Codeberg Translate
18b60db6ae i18n: update of translations from Codeberg Translate (#5514) 
Co-authored-by: CDN18 <CDN18@users.noreply.translate.codeberg.org>
Co-authored-by: q3yi <q3yi@users.noreply.translate.codeberg.org>
Co-authored-by: Juno Takano <jutty@users.noreply.translate.codeberg.org>
Co-authored-by: xtex <xtexchooser@duck.com>
Co-authored-by: Benedikt Straub <Nordfriese@users.noreply.translate.codeberg.org>
Co-authored-by: ddogfoodd <ddogfoodd@users.noreply.translate.codeberg.org>
Co-authored-by: Wuzzy <Wuzzy@users.noreply.translate.codeberg.org>
Co-authored-by: mahlzahn <mahlzahn@posteo.de>
Co-authored-by: Beowulf <Beowulf@users.noreply.translate.codeberg.org>
Co-authored-by: qwerty287 <qwerty287@users.noreply.translate.codeberg.org>
Co-authored-by: SteffoSpieler <SteffoSpieler@users.noreply.translate.codeberg.org>
Co-authored-by: sinsky <sinsky@users.noreply.translate.codeberg.org>
Co-authored-by: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Co-authored-by: fnetX <otto@codeberg.org>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: Fnurkla <Fnurkla@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5514
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 575276cf79)
 2024-10-14 03:35:31 +00:00
Earl Warren
1b36e34fc4 Merge pull request '[v9.0/forgejo] fix: don't cancel schedule workflows on push to main branch' (#5547) from bp-v9.0/forgejo-b20c0b1 into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5547
Reviewed-by: Kwonunn <kwonunn@noreply.codeberg.org>
 2024-10-13 13:32:25 +00:00
Kwonunn
d2d161ad28 fix: don't cancel schedule workflows on push to main branch 
(cherry picked from commit b20c0b1469)
 2024-10-13 12:25:59 +00:00
Otto
f2f2d7dab2 Merge pull request '[v9.0/forgejo] i18n: Improve translation strings for webhook events' (#5538) from bp-v9.0/forgejo-86bac2c into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5538
Reviewed-by: Otto <otto@codeberg.org>
 2024-10-12 16:13:29 +00:00
Otto Richter
1667fece88 i18n: Improve translation strings for webhook events (#5537) 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5537
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Otto Richter <git@otto.splvs.net>
Co-committed-by: Otto Richter <git@otto.splvs.net>
(cherry picked from commit 86bac2c54e)
 2024-10-12 15:19:53 +00:00
Earl Warren
044cd5cf7e Merge pull request '[v9.0/forgejo] Fix bug when a token is given public only' (#5526) from earl-warren/forgejo:wip-v9.0-public-scope into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5526
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-10-11 20:16:28 +00:00
Otto
dfd1b2fdcd Merge pull request '[v9.0/forgejo] i18n: remove unnecessary variable' (#5535) from bp-v9.0/forgejo-aafc1de into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5535
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
 2024-10-11 19:34:14 +00:00
Otto
bf1839aed3 Merge pull request '[v9.0/forgejo] i18n: Fine tune language for units' (#5534) from bp-v9.0/forgejo-79a3fe6 into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5534
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
 2024-10-11 19:22:50 +00:00
Otto
26f0a7e779 Merge pull request '[v9.0/forgejo] [BUG] Make chroma match case-insenstive' (#5532) from bp-v9.0/forgejo-dcc4423 into v9.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5532
Reviewed-by: Otto <otto@codeberg.org>
 2024-10-11 19:07:06 +00:00
Otto Richter
a7f4346f5e fix(i18n): remove unnecessary variable (#5533) 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5533
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Otto Richter <git@otto.splvs.net>
Co-committed-by: Otto Richter <git@otto.splvs.net>
(cherry picked from commit aafc1de0a3)
 2024-10-11 18:52:23 +00:00
Otto Richter
d2ee58fb2a i18n: Fine tune language for units (#5523) 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5523
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Otto Richter <git@otto.splvs.net>
Co-committed-by: Otto Richter <git@otto.splvs.net>
(cherry picked from commit 79a3fe6cc6)
 2024-10-11 18:28:59 +00:00