Earl Warren
118b8eb9c1
Merge pull request '[v7.0/forgejo] Fix AGit pull request instructions' ( #4478 ) from bp-v7.0/forgejo-0a5fa31 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4478
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-07-13 22:10:07 +00:00
Beowulf
a580dcc7aa
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:27:51 +00:00
Earl Warren
e2751875e3
Merge pull request '[v7.0/forgejo] Fix: Name conan remote forgejo' ( #4464 ) from bp-v7.0/forgejo-6efaf15 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4464
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-07-12 14:44:45 +00:00
Kwonunn
e551bed57f
Fix: Name conan remote forgejo
...
(cherry picked from commit 6efaf155d9
2024-07-12 13:28:14 +00:00
forgejo-backport-action
8902dd26db
[v7.0/forgejo] Improvements to English locale ( #4459 )
...
**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/4459
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 12:46:25 +00:00
0ko
5199534075
Merge pull request '[forgejo/v7.0] Update of translations from Weblate' ( #4447 ) from 0ko/forgejo:i18n-backport-20240711 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4447
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-07-11 12:26:06 +00:00
Codeberg Translate
6e22f4093a
[forgejo/v7.0] i18n: update of translations from Weblate
...
Backport of https://codeberg.org/forgejo/forgejo/pulls/4330
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>
2024-07-11 14:21:04 +05:00
Earl Warren
4010232452
Merge pull request '[v7.0/forgejo] [accessibility] Anchor elements' missing href added' ( #4422 ) from bp-v7.0/forgejo-0996828 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4422
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-07-09 12:25:59 +00:00
0ko
a72ad8ceef
Merge pull request '[v7.0/forgejo] [BUG] Fix mobile UI for organisation creation' ( #4424 ) from bp-v7.0/forgejo-610487e into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4424
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2024-07-08 19:47:36 +00:00
Earl Warren
99d55ca4b2
Merge pull request '[v7.0/forgejo] tests: run JavaScript tests when web_src/js is modified' ( #4425 ) from bp-v7.0/forgejo-a6a64f1 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4425
2024-07-08 19:33:48 +00:00
Earl Warren
a7b8d96fd6
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:25 +00:00
Gusted
46115041b8
[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-08 18:48:58 +00:00
banaanihillo
b27ff92352
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:32 +00:00
0ko
e918dd42e4
Merge pull request 'Backport recent translation updates to v7' ( #4420 ) from 0ko/forgejo:i18n-backport-20240708 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4420
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-07-08 15:37:06 +00:00
Codeberg Translate
2c7e3448db
[v7/forgejo] i18n: translations update from Weblate
...
Backport of https://codeberg.org/forgejo/forgejo/pulls/4251 .
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: Panagiotis \"Ivory\" Vasilopoulos <git@n0toose.net>
Co-authored-by: ZDev <ZDev@users.noreply.translate.codeberg.org>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: Wuzzy <Wuzzy@users.noreply.translate.codeberg.org>
Co-authored-by: fnetX <otto@codeberg.org>
Co-authored-by: hankskyjames777 <hankskyjames777@users.noreply.translate.codeberg.org>
Co-authored-by: Kita Ikuyo <searinminecraft@courvix.com>
Co-authored-by: Marco Ciampa <ciampix@users.noreply.translate.codeberg.org>
Co-authored-by: kdh8219 <kdh8219@monamo.dev>
Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org>
Co-authored-by: b1nar10 <b1nar10@users.noreply.translate.codeberg.org>
Co-authored-by: Eryk Michalak <gnu.ewm@protonmail.com>
Co-authored-by: revi <revi@omglol.email>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4251
Co-authored-by: Codeberg Translate <translate@noreply.codeberg.org>
Co-committed-by: Codeberg Translate <translate@noreply.codeberg.org>
(cherry picked from commit 2a643d2136
2024-07-08 19:28:56 +05:00
Codeberg Translate
3135f0b8b0
[v7/forgejo] i18n: translations update from Weblate
...
Backport of https://codeberg.org/forgejo/forgejo/pulls/4168 .
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: overloop <overloop@users.noreply.translate.codeberg.org>
Co-authored-by: b1nar10 <b1nar10@users.noreply.translate.codeberg.org>
Co-authored-by: hankskyjames777 <hankskyjames777@users.noreply.translate.codeberg.org>
Co-authored-by: yeziruo <yeziruo@users.noreply.translate.codeberg.org>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: bart <bart@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: kdh8219 <kdh8219@monamo.dev>
Co-authored-by: sunwoo1524 <sunwoo1524@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4168
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 8afdafebf9
2024-07-08 19:27:25 +05:00
Codeberg Translate
8fe4820a9f
[v7.0/forgejo] i18n: translations update from Weblate
...
Backport of https://codeberg.org/forgejo/forgejo/pulls/4098 .
Co-authored-by: 0ko <0ko@users.noreply.translate.codeberg.org>
Co-authored-by: sinsky <sinsky@users.noreply.translate.codeberg.org>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: Wuzzy <Wuzzy@users.noreply.translate.codeberg.org>
Co-authored-by: Dirk <Dirk@users.noreply.translate.codeberg.org>
Co-authored-by: Xinayder <Xinayder@users.noreply.translate.codeberg.org>
Co-authored-by: hankskyjames777 <hankskyjames777@users.noreply.translate.codeberg.org>
Co-authored-by: emansije <emansije@users.noreply.translate.codeberg.org>
Co-authored-by: earl-warren <earl-warren@users.noreply.translate.codeberg.org>
Co-authored-by: bbjubjub2494 <bbjubjub2494@users.noreply.translate.codeberg.org>
Co-authored-by: lotigara <lotigara@users.noreply.translate.codeberg.org>
Co-authored-by: Kita Ikuyo <searinminecraft@courvix.com>
Co-authored-by: kdh8219 <kdh8219@monamo.dev>
Co-authored-by: b1nar10 <b1nar10@users.noreply.translate.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4098
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 1f386d4a83
2024-07-08 19:25:15 +05:00
Earl Warren
09054cb191
Merge pull request '[v7.0/forgejo] [BUG] Use correct SHA in GetCommitPullRequest' ( #4379 ) from bp-v7.0/forgejo-a8460bb into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4379
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-07-06 21:43:16 +00:00
Gusted
2e0e0b48f0
[BUG] Use correct SHA in GetCommitPullRequest
...
- The param wasn't `sha`, it was `ref`. Use this instead.
- Adds new integration tests.
- Resolves #4190
- Resolves #4025
(cherry picked from commit a8460bb132
2024-07-06 21:00:31 +00:00
Earl Warren
8d317a1de8
Merge pull request '[v7.0/forgejo] test: issue sidebar testing using playwright' ( #4335 ) from bp-v7.0/forgejo-fafc4f6 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4335
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-07-05 05:48:25 +00:00
Otto Richter
b890d90874
test: issue sidebar testing using playwright ( #4319 )
...
Conclusion of https://codeberg.org/forgejo/forgejo/issues/3499
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4319
Co-authored-by: Otto Richter <git@otto.splvs.net>
Co-committed-by: Otto Richter <git@otto.splvs.net>
(cherry picked from commit fafc4f6ad9
2024-07-05 05:05:59 +00:00
Earl Warren
de115cff02
Merge pull request '[v7.0/forgejo] build(go-licenses): support go toolchain mismatch' ( #4324 ) from bp-v7.0/forgejo-b31e21d into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4324
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-07-04 15:14:33 +00:00
Michael Kriese
a4c834dbbd
build(go-licenses): support go toolchain mismatch
...
(cherry picked from commit b31e21d80e
2024-07-04 14:15:49 +00:00
Earl Warren
65a89ce6be
Merge pull request '[v7.0/forgejo] Fix wrong string used in a search box' ( #4261 ) from bp-v7.0/forgejo-28ceec6 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4261
Reviewed-by: Otto <otto@codeberg.org>
2024-06-29 07:30:12 +00:00
0ko
d3a0eb3bdd
ui: fix wrong string used in a search box ( #4258 )
...
Resolves https://codeberg.org/forgejo/forgejo/issues/4256 .
Fixes regression caused by https://github.com/go-gitea/gitea/pull/29530/files#diff-b46ae540c8eb41d1ccaa1659489fcc47d72eee4c4f04dc83c5ccf4d6d1a3395eR45 .
Preview:
Before - https://codeberg.org/forgejo/forgejo/attachments/d629f2e9-0d07-4719-9250-52d3ba9f4a9e
After - https://codeberg.org/forgejo/forgejo/attachments/6a5f5cb2-124d-4673-a387-8483125a89eb
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4258
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
(cherry picked from commit 28ceec6fad
2024-06-28 16:29:11 +00:00
Earl Warren
6ef70edb0b
Merge pull request '[v7.0/forgejo] Update module golang.org/x/image to v0.18.0' ( #4248 ) from earl-warren/forgejo:wip-x-image into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4248
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-06-26 11:32:24 +00:00
Earl Warren
2c48693a60
[v7.0/forgejo] Update module golang.org/x/image to v0.18.0
...
**Backport:** https://codeberg.org/forgejo/forgejo/pulls/4241
2024-06-26 12:46:03 +02:00
Earl Warren
2a493224e5
Merge pull request '[v7.0/forgejo] fix(security): GO-2024-2947' ( #4249 ) from earl-warren/forgejo:wip-v7.0-retryhttp into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4249
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-06-26 10:41:49 +00:00
Earl Warren
c43689b852
[v7.0/forgejo] fix(security): GO-2024-2947
...
**Backport:** https://codeberg.org/forgejo/forgejo/pulls/4245
2024-06-26 12:08:03 +02:00
Earl Warren
9763a7eadc
Merge pull request '[gitea] week 2024-26-v7.0 cherry pick (release/v1.22 -> v7.0/forgejo)' ( #4215 ) from earl-warren/wcp/2024-26-v7.0 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4215
Reviewed-by: twenty-panda <twenty-panda@noreply.codeberg.org>
2024-06-25 06:16:30 +00:00
Earl Warren
637d6d5c5f
Merge pull request '[v7.0/forgejo] test: coverage for /repos/{owner}/{repo}/issues?project=' ( #4219 ) from bp-v7.0/forgejo-b18ba81 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4219
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-06-23 20:20:04 +00:00
Lunny Xiao
0a90bf51af
Fix bug filtering issues which have no project ( #31337 ) ( #31367 )
...
(cherry picked from commit a9d1e4311e56855a6efc8defd3686f7f985617d0)
2024-06-23 21:49:37 +02:00
Twenty Panda
cc425ad87b
test: coverage for /repos/{owner}/{repo}/issues?project=
...
Refs: https://codeberg.org/forgejo/forgejo/pulls/4215#issuecomment-2040651
(cherry picked from commit b18ba810a5
2024-06-23 19:35:08 +00:00
charles
4ed5044dea
Fix markdown math brackets render problem ( #31420 )
...
Close #31371 , support `($ ... $)` like GitHub
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 90a3c20e7996e2db577a51d37f2190e2e990a22a)
Conflicts:
modules/markup/markdown/markdown_test.go
trivial context conflict
(cherry picked from commit b53be9d45c
2024-06-23 14:56:42 +02:00
Giteabot
e61aa25412
Reduce air verbosity ( #31417 ) ( #31425 )
...
Backport #31417 by @silverwind
Make `air` log less. Uses the option added in
https://github.com/air-verse/air/pull/367 .
Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit 3813b2786295087b3a5ecb3562fc35d90c439bf0)
2024-06-23 14:54:21 +02:00
Earl Warren
04a8162e4f
Merge pull request '[v7.0/forgejo] Improve wording in user blocking modal' ( #4205 ) from bp-v7.0/forgejo-5d74125 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4205
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-06-22 13:34:58 +00:00
0ko
6e80db59f9
[I18N] Improve wording in user blocking modal
...
(cherry picked from commit 5d741259da
2024-06-22 12:23:15 +00:00
Earl Warren
2b22c80738
Merge pull request '[v7.0/forgejo] [BUG] admin oauth2 source required check' ( #4195 ) from bp-v7.0/forgejo-65f8c22 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4195
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-06-21 07:01:51 +00:00
oliverpool
6cef23db1d
[BUG] admin oauth2 source required check ( #4194 )
...
#4059 was unfortunately incomplete: some custom_url fields are currently shown, even if they are not used by the provider. Moreover the `Use Custom URLs Instead of Default URLs` is always checked by default.
Manual testing:
- go to http://localhost:3000/admin/auths
- click on `Add authentication source`
- Choose `Authentication type`: `OAuth2`
- Choose `OAuth2 provider`: `GitLab`
- verify that the `Use Custom URLs Instead of Default URLs` option is **initially unchecked**
- enable the `Use Custom URLs Instead of Default URLs` checkbox
- verify that only the fields "Authorize", "Token" and "Profile" URLs are shown (no "Email URL", nor "Tenant").
- Switch the `OAuth2 provider` to `Azure AD v2`
- verify that the `Use Custom URLs Instead of Default URLs` option is **initially checked**
- verify that only the field "Tenant" is shown (with the default "organizations").
Note: this is loosely based on the upstream fix https://github.com/go-gitea/gitea/pull/31246 which I initially overlooked.
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4194
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: oliverpool <git@olivier.pfad.fr>
Co-committed-by: oliverpool <git@olivier.pfad.fr>
(cherry picked from commit 65f8c22cc7
2024-06-21 06:22:03 +00:00
Earl Warren
664c8a99cb
Merge pull request '[v7.0/forgejo] [SWAGGER] Make UserSettings definition an non-array' ( #4184 ) from bp-v7.0/forgejo-5926ed1 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4184
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-06-19 09:55:17 +00:00
Earl Warren
cd7a0afc36
Merge pull request '[v7.0/backport] Update module github.com/gorilla/feeds to v1.2.0' ( #4183 ) from earl-warren/forgejo:wip-v7.0-feed into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4183
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-06-19 06:45:24 +00:00
Gusted
dc228b4734
[SWAGGER] Make it consistent with reality
...
- Make the `UserSettings` definition an non-array, this is consistent
with the existing endpoints that uses this definition.
- Resolves #4179
(cherry picked from commit 5926ed1f73
2024-06-19 06:40:17 +00:00
Earl Warren
74466215e4
[v7.0/backport] Update module github.com/gorilla/feeds to v1.2.0
...
**Backport:** https://codeberg.org/forgejo/forgejo/pulls/4166
This PR contains the following updates:
| Package | Type | Update | Change |
|---|---|---|---|
| [github.com/gorilla/feeds](https://github.com/gorilla/feeds ) | require | minor | `v1.1.2` -> `v1.2.0` |
---
<details>
<summary>gorilla/feeds (github.com/gorilla/feeds)</summary>
[Compare Source](https://github.com/gorilla/feeds/compare/v1.1.2...v1.2.0 )
- Add the `isPermaLink` attribute to `guid` in RSS by [@​yardenshoham](https://github.com/yardenshoham ) in https://github.com/gorilla/feeds/pull/107
- [@​yardenshoham](https://github.com/yardenshoham ) made their first contribution in https://github.com/gorilla/feeds/pull/107
**Full Changelog**: https://github.com/gorilla/feeds/compare/v1.1.2...v1.2.0
</details>
---
📅 **Schedule**: Branch creation - "before 4am" (UTC), Automerge - "before 4am" (UTC).
🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.
â™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 **Ignore**: Close this PR and you won't be reminded about this update again.
---
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box
---
This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate ).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40MDkuMSIsInVwZGF0ZWRJblZlciI6IjM3LjQwOS4xIiwidGFyZ2V0QnJhbmNoIjoiZm9yZ2VqbyIsImxhYmVscyI6WyJkZXBlbmRlbmN5LXVwZ3JhZGUiXX0=-->
2024-06-19 08:11:44 +02:00
Earl Warren
6cb63e03e1
Merge pull request '[v7.0/forgejo] Port: Fix Activity Page Contributors dropdown (gitea#31264)' ( #4177 ) from bp-v7.0/forgejo-3544746 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4177
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-06-18 20:31:41 +00:00
wxiaoguang
7b443b6b54
Fix Activity Page Contributors dropdown ( #31264 )
...
Fix #31261
(cherry picked from commit e728fd741be7848d476663eec1c9caaf34b46e61)
(cherry picked from commit 35447463ba
2024-06-18 19:42:31 +00:00
Earl Warren
34c970d4e5
Merge pull request '[gitea] week 2024-25-v7.0 cherry pick (release/v1.22 -> v7.0/forgejo)' ( #4146 ) from earl-warren/wcp/2024-25-v7.0 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4146
Reviewed-by: twenty-panda <twenty-panda@noreply.codeberg.org>
2024-06-18 07:55:54 +00:00
Earl Warren
fa54833436
Merge pull request '[v7.0/forgejo] test(dump): don't depend on directory listing order' ( #4162 ) from bp-v7.0/forgejo-230a677 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4162
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-06-17 19:29:24 +00:00
emilylange
f01dc4b271
test(dump): don't depend on directory listing order
...
cmd/dump.go uses os.Readdir to list the directory.
This is fine on its own, but TestAddRecursiveExclude in cmd/dump_test.go
depends on the order of the directory listing, which is where the issue
lays.
Directory listings using os.Readdir (lstat) don't actually guarantee an
order. They can differ due to a number of factors. Most notably the OS,
file system and settings.
As such, the test should not check the /order of the files/ added to the
archive, but instead simply check whether the archive /contains/ them.
So this is precisely what this commit does.
Note that only TestAddRecursiveExclude/File_inside_directory/No_exclude
has been observed to fail due to this, but all TestAddRecursiveExclude
subtests have been updated for consistency.
(cherry picked from commit 230a677c74
2024-06-17 18:53:34 +00:00
Earl Warren
2d42dbc495
Merge pull request '[v7.0/forgejo] [BUG] admin authentication source JS errors' ( #4159 ) from bp-v7.0/forgejo-82ae746 into v7.0/forgejo
...
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4159
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
2024-06-17 10:39:29 +00:00
oliverpool
715bedbde7
[BUG] admin authentication source JS errors ( #4059 )
...
While trying to understand #1236 , I was quite confused not to see the `Use Custom URLs` checkbox.
This checkbox disappeared in b95a893b224e816e13263efa4d836ahttp://localhost:3000/admin/auths
- click on `Add authentication source`
- Choose `Authentication type`: `OAuth2`
- Choose `OAuth2 provider`: `Nextcloud`
- check that the `Use Custom URLs Instead of Default URLs` checkbox toggles the fields below
- let the checkbox be checked
- Switch the `OAuth2 provider` to `OpenID Connect`
- ensure that no JS error is shown
- Switch the `OAuth2 provider` to `Mastodon`
- check that the fields below `Use Custom URLs Instead of Default URLs` have the right defaults (mastodon.social)
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4059
Reviewed-by: twenty-panda <twenty-panda@noreply.codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: oliverpool <git@olivier.pfad.fr>
Co-committed-by: oliverpool <git@olivier.pfad.fr>
(cherry picked from commit 82ae7460bf
2024-06-17 10:06:34 +00:00
