foster/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-21 12:44:49 -05:00
Code Issues Wiki Activity
20115 commits 21 branches 237 tags 607 MiB
Commit graph

20115 commits

This branch
This branch
All branches
Author SHA1 Message Date
Earl Warren
8e8452bafa Merge pull request 'Update dependency mermaid to v10.9.3 [SECURITY] (v8.0/forgejo)' (#5726) from renovate/v8.0/forgejo-npm-mermaid-vulnerability into v8.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5726
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-10-28 08:41:15 +00:00
Renovate Bot
9aa610c4c8 Update dependency mermaid to v10.9.3 [SECURITY] 2024-10-28 06:29:07 +00:00
0ko
a3e4347994 Merge pull request '[v8.0/forgejo] Update of translations from Codeberg (backport of #5309)' (#5400) from 0ko/forgejo:i18n-backport-20240926-5309 into v8.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5400
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-09-27 12:46:15 +00:00
Codeberg Translate
9791010feb [v8.0/forgejo] i18n: update of translations from Codeberg 
Backport: https://codeberg.org/forgejo/forgejo/pulls/5309.

Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Co-authored-by: aleksi <aleksi@users.noreply.translate.codeberg.org>
Co-authored-by: Vaclovas Intas <Gateway_31@protonmail.com>
Co-authored-by: toasterbirb <toasterbirb@users.noreply.translate.codeberg.org>
Co-authored-by: Salif Mehmed <mail@salif.eu>
Co-authored-by: Zughy <Zughy@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5309
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 6d57cbe5c8)
 2024-09-26 20:23:10 +05:00
Earl Warren
da212f25c5 Merge pull request '[v8.0/forgejo] Fix: database not updated when using git push --tags --force' (#5371) from bp-v8.0/forgejo-a6508f5 into v8.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5371
 2024-09-22 09:41:26 +00:00
Exploding Dragon
4cd425a7d7 Fix: database not updated when using git push --tags --force (#5319) 
Closes #4274

link: https://github.com/go-gitea/gitea/pull/32040

### Release notes

- [ ] I do not want this change to show in the release notes.

<!--start release-notes-assistant-->

## Draft release notes
<!--URL:https://codeberg.org/forgejo/forgejo-->
- Bug fixes
  - [PR](https://codeberg.org/forgejo/forgejo/pulls/5319): <!--number 5319 --><!--line 0 --><!--description Rml4OiBkYXRhYmFzZSBub3QgdXBkYXRlZCB3aGVuIHVzaW5nIGBnaXQgcHVzaCAtLXRhZ3MgLS1mb3JjZWA=-->Fix: database not updated when using `git push --tags --force`<!--description-->
<!--end release-notes-assistant-->

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5319
Reviewed-by: Otto <otto@codeberg.org>
Co-authored-by: Exploding Dragon <explodingfkl@gmail.com>
Co-committed-by: Exploding Dragon <explodingfkl@gmail.com>
(cherry picked from commit a6508f5b03)
 2024-09-22 07:36:16 +00:00
0ko
f7ecae22e4 [v8.0/forgejo] i18n(*): protect strings from breaking by v9 updates (#5341) 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5341
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-09-20 14:14:20 +00:00
0ko
9f0999215e Merge pull request '[v8.0/forgejo] i18n: update of translations from Codeberg Translate' (#5310) from 0ko/forgejo:i18n-backport-20240912-v8 into v8.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5310
Reviewed-by: Otto <otto@codeberg.org>
 2024-09-17 16:54:59 +00:00
Codeberg Translate
884b5aab8b [v8.0/forgejo] i18n: update of translations from Codeberg Translate 
Backport: https://codeberg.org/forgejo/forgejo/pulls/5231.

Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org>
Co-authored-by: xtex <xtexchooser@duck.com>
Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org>
Co-authored-by: Monti <contact@montidaproot.xyz>
Co-authored-by: muhaaliss <muhaaliss@users.noreply.translate.codeberg.org>
Co-authored-by: EssGeeEich <EssGeeEich@users.noreply.translate.codeberg.org>
Co-authored-by: Zughy <Zughy@users.noreply.translate.codeberg.org>
Co-authored-by: Marco Ciampa <ciampix@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5231
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 2d3fc00d02)
 2024-09-12 20:38:31 +05:00
Otto
be8097df23 Merge pull request '[v8.0/forgejo] Improve textarea paste (part of gitea#31948) #5269' (#5301) from fnetx/bp-textarea-paste into v8.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5301
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-09-12 13:00:38 +00:00
Otto
ed3cbdaeee Merge pull request '[v8.0/forgejo] Fix bad spacing on new release page #5261' (#5302) from fnetx/bp-release-spacing into v8.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5302
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-09-12 12:41:45 +00:00
Otto Richter
69507ff2f4 tests(e2e): assert URL paste behaviour 2024-09-12 13:51:21 +02:00
Malte Jürgens
f518d508ef Fix bad spacing on new release page 2024-09-12 13:32:20 +02:00
silverwind
1f9a5dc9fd Improve textarea paste (part of gitea#31948) 
When pasting a URL over another URL, replace the URL instead of creating
a useless `[url](url)`.

(Partially picked from commit 55502265716f000a2c61c98fa093244e1310d97f)

Signed-off-by: Gergely Nagy <forgejo@gergo.csillger.hu>
 2024-09-12 13:22:32 +02:00
Earl Warren
4763733caa Merge pull request 'Update dependency go to v1.22.7 (v8.0/forgejo)' (#5242) from renovate/v8.0/forgejo-patch-golang-packages into v8.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5242
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-09-06 22:56:38 +00:00
Earl Warren
71658e2953 Merge pull request '[v8.0/forgejo] replace v-html with v-text in branch search inputbox for XSS protection' (#5247) from bp-v8.0/forgejo-bb8796b into v8.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5247
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-09-06 11:58:45 +00:00
Lunny Xiao
ef6a58cfaa fix: replace v-html with v-text in branch search inputbox 
Co-authored-by: techknowlogick <techknowlogick@noreply.gitea.com>
(cherry picked from commit 7eef261c3ebf9bfe37fe0dceb51bde9a79bbaf17)
(cherry picked from commit bb8796b3be)
 2024-09-06 10:38:09 +00:00
Renovate Bot
91ce4ab95d Update dependency go to v1.22.7 2024-09-06 05:19:09 +00:00
Earl Warren
668f942db0 Merge pull request '[v8.0/forgejo] i18n: update of translations from Codeberg Translate' (#5230) from bp-v8.0/forgejo-fb4a8b2 into v8.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5230
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
 2024-09-05 06:26:41 +00:00
Codeberg Translate
1fc2e1f02d i18n: update of translations from Codeberg Translate (#5182) 
Translations update from [Codeberg Translate](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)

<!--start release-notes-assistant-->

## Draft release notes
<!--URL:https://codeberg.org/forgejo/forgejo-->
- Localization
  - [PR](https://codeberg.org/forgejo/forgejo/pulls/5182): <!--number 5182 --><!--line 0 --><!--description aTE4bjogdXBkYXRlIG9mIHRyYW5zbGF0aW9ucyBmcm9tIENvZGViZXJnIFRyYW5zbGF0ZQ==-->i18n: update of translations from Codeberg Translate<!--description-->
<!--end release-notes-assistant-->

Co-authored-by: Vaclovas Intas <Gateway_31@protonmail.com>
Co-authored-by: Monti <contact@montidaproot.xyz>
Co-authored-by: sclu1034 <sclu1034@users.noreply.translate.codeberg.org>
Co-authored-by: Dirk <Dirk@users.noreply.translate.codeberg.org>
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5182
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 fb4a8b24cc)
 2024-09-05 05:42:15 +00:00
Earl Warren
b976c7f53f Merge pull request 'Update dependency webpack to v5.94.0 [SECURITY] (v8.0/forgejo)' (#5202) from renovate/v8.0/forgejo-npm-webpack-vulnerability into v8.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5202
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
 2024-09-03 08:36:41 +00:00
Renovate Bot
40cf3c3187 Update dependency webpack to v5.94.0 [SECURITY] 2024-09-02 06:22:35 +00:00
Earl Warren
e582bdab4d Merge pull request '[v8.0/forgejo] i18n: update of translations from Codeberg Translate' (#5161) from bp-v8.0/forgejo-45198ce into v8.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5161
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
 2024-08-30 12:11:45 +00:00
Codeberg Translate
b73fd55374 i18n: update of translations from Codeberg Translate (#5070) 
Translations update from [Codeberg Translate](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)

<!--start release-notes-assistant-->

## Draft release notes
<!--URL:https://codeberg.org/forgejo/forgejo-->
- Localization
  - [PR](https://codeberg.org/forgejo/forgejo/pulls/5070): <!--number 5070 --><!--line 0 --><!--description aTE4bjogdXBkYXRlIG9mIHRyYW5zbGF0aW9ucyBmcm9tIENvZGViZXJnIFRyYW5zbGF0ZQ==-->i18n: update of translations from Codeberg Translate<!--description-->
<!--end release-notes-assistant-->

Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org>
Co-authored-by: Xinayder <Xinayder@users.noreply.translate.codeberg.org>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-authored-by: Kita Ikuyo <searinminecraft@courvix.com>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: hugoalh <hugoalh@users.noreply.translate.codeberg.org>
Co-authored-by: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Co-authored-by: Eryk Michalak <gnu.ewm@protonmail.com>
Co-authored-by: Caesar Schinas <caesar@caesarschinas.com>
Co-authored-by: hankskyjames777 <hankskyjames777@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5070
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 45198cef64)
 2024-08-29 04:55:27 +00:00
Earl Warren
949e415fd3 Merge pull request '[gitea] week 2024-35-v8.0 cherry pick (gitea/main -> v8.0/forgejo)' (#5112) from earl-warren/wcp/2024-35-v8.0 into v8.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5112
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-08-28 10:31:23 +00:00
Gusted
9969870cf5 Merge pull request '[v8.0/forgejo] [SEC] Ensure propagation of API scopes for Conan and Container authentication' (#5151) from bp-v8.0/forgejo-5a871f6 into v8.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5151
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
 2024-08-28 10:08:38 +00:00
Gusted
02db188a50 [SEC] Ensure propagation of API scopes for Conan and Container authentication 
- The Conan and Container packages use a different type of
authentication. It first authenticates via the regular way (api tokens
or user:password, handled via `auth.Basic`) and then generates a JWT
token that is used by the package software (such as Docker) to do the
action they wanted to do. This JWT token didn't properly propagate the
API scopes that the token was generated for, and thus could lead to a
'scope escalation' within the Conan and Container packages, read
access to write access.
- Store the API scope in the JWT token, so it can be propagated on
subsequent calls that uses that JWT token.
- Integration test added.
- Resolves #5128

(cherry picked from commit 5a871f6095)
 2024-08-28 08:45:05 +00:00
Earl Warren
d3ff96ef86 Merge pull request '[v8.0/forgejo] fix: correct doctor commands and rename to forgejo' (#5135) from bp-v8.0/forgejo-94af0e5 into v8.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5135
Reviewed-by: Otto <otto@codeberg.org>
 2024-08-27 06:13:59 +00:00
Otto Richter
5faa51a16b fix: correct doctor commands and rename to forgejo 
The syntax is `doctor check --run` , see https://forgejo.org/docs/latest/admin/command-line/#doctor

(cherry picked from commit 94af0e53e5)
 2024-08-27 01:44:08 +00:00
0ko
06917ce8a0 Merge pull request '[v8.0/forgejo] i18n: update of translations from Codeberg Translate' (#5116) from bp-v8.0/forgejo-d30be16 into v8.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5116
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
 2024-08-25 18:58:13 +00:00
Codeberg Translate
619f2faf98 i18n: update of translations from Codeberg Translate (#4984) 
Translations update from [Codeberg Translate](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)

<!--start release-notes-assistant-->

## Draft release notes
<!--URL:https://codeberg.org/forgejo/forgejo-->
- Localization
  - [PR](https://codeberg.org/forgejo/forgejo/pulls/4984): <!--number 4984 --><!--line 0 --><!--description aTE4bjogdXBkYXRlIG9mIHRyYW5zbGF0aW9ucyBmcm9tIENvZGViZXJnIFRyYW5zbGF0ZQ==-->i18n: update of translations from Codeberg Translate<!--description-->
<!--end release-notes-assistant-->

Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org>
Co-authored-by: qui <qui@users.noreply.translate.codeberg.org>
Co-authored-by: hahahahacker2009 <hahahahacker2009@users.noreply.translate.codeberg.org>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Co-authored-by: Wuzzy <Wuzzy@users.noreply.translate.codeberg.org>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-authored-by: fnetX <otto@codeberg.org>
Co-authored-by: Panagiotis \"Ivory\" Vasilopoulos <git@n0toose.net>
Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4984
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 d30be160c9)
 2024-08-25 18:00:17 +00:00
0ko
4e88e3590b Merge pull request '[v8.0/forgejo] i18n: update of translations from Codeberg Translate' (#5114) from bp-v8.0/forgejo-17fa750 into v8.0/forgejo 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5114
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
 2024-08-25 17:31:44 +00:00
Codeberg Translate
c13d13f7cc i18n: update of translations from Codeberg Translate (#4889) 
Translations update from [Codeberg Translate](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: earl-warren <earl-warren@users.noreply.translate.codeberg.org>
Co-authored-by: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Co-authored-by: Panagiotis \"Ivory\" Vasilopoulos <git@n0toose.net>
Co-authored-by: dragon <dragon@users.noreply.translate.codeberg.org>
Co-authored-by: hoovad <hoovad@users.noreply.translate.codeberg.org>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-authored-by: hankskyjames777 <hankskyjames777@users.noreply.translate.codeberg.org>
Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org>
Co-authored-by: hugoalh <hugoalh@users.noreply.translate.codeberg.org>
Co-authored-by: zub <zub@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: Kita Ikuyo <searinminecraft@courvix.com>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4889
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 17fa75074d)
 2024-08-25 15:55:17 +00:00
Earl Warren
930e718afe
chore(release-notes): weekly cherry-pick week 2024-35-v8.0 2024-08-25 17:54:29 +02:00
Lunny Xiao
bd9edb6fed
Use correct function name (#31887) 
(cherry picked from commit 0299bb97f038685aee794a992fa4a9f5cf83652e)
 2024-08-25 17:32:50 +02:00
Rowan Bohde
41281fc80a
add CfTurnstileSitekey context data to all captcha templates (#31874) 
In the OpenID flows, the "CfTurnstileSitekey" wasn't populated, which
caused those flows to fail if using Turnstile as the Captcha
implementation.

This adds the missing context variables, allowing Turnstile to be used
in the OpenID flows.

(cherry picked from commit 0d24c9f383255605d68a92cc5f087c3f16a1d735)
 2024-08-25 17:15:25 +02:00
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 
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 
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)

Conflicts:
	go.sum
  trivial context conflict
 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