611610c3c4
[BUG] Detect protected branch on branch rename
...
- If a branch cannot be renamed due to a protected branch rule, show
this error in the UI instead of throwing an internal server error.
- Add integration test (also simplify the existing one).
- Resolves #2751
2024-03-26 21:09:53 +01:00
ee87a652e9
Editor error message misleading due to re-used key. ( #29859 ) ( #29876 )
...
Backport #29859 by @buckybytes
The error message:
`editor.file_changed_while_editing = The file contents have changed
since you started editing. <a target="_blank" rel="noopener noreferrer"
href="%s">Click here</a> to see them or <strong>Commit Changes
again</strong> to overwrite them.`
Is re-used in inappropriate contexts. The link in the key goes to a 404
when the key is used in a situation where the file contents have not
changed.
Added two new keys to differentiate commit id mismatch and push out of
date conditions.
Co-authored-by: buckybytes <158571971+buckybytes@users.noreply.github.com>
(cherry picked from commit 00ea9af8e118790a186b4cf78a0ce85ce986bf1d)
2024-03-21 17:09:50 +01:00
66061d2828
Fix 500 when deleting account with incorrect password or unsupported login type ( #29579 ) ( #29656 )
...
Fix #26210
Backport #29579
Co-authored-by: Jason Song <i@wolfogre.com>
(cherry picked from commit a129c0c06c91e4994244138687be135dddd4c00d)
2024-03-10 18:45:59 +07:00
446d7bd7a7
Fix incorrect redirection when creating a PR fails ( #29537 ) ( #29543 )
...
Backport #29537 by wxiaoguang
This is only a quick fix to make it easier to backport.
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 971eab18fa0b29312105df739fba443cf9e84d50)
2024-03-10 18:45:59 +07:00
a28d6686fa
Fix validity of the FROM email address not being checked ( #29347 ) ( #29360 )
...
Backport #29347 by @carlosfelgueiras
Fixes #27188 .
Introduces a check on the installation that tries to parse the FROM
address. If it fails, shows a new error message to the user.
Co-authored-by: Carlos Felgueiras <carlosfelgueiras@tecnico.ulisboa.pt>
Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
(cherry picked from commit 35db5a373babd9af157fd63eeb20d6da53320b73)
2024-03-06 12:20:42 +08:00
5124be72aa
Forbid removing the last admin user ( #28337 ) ( #28793 )
...
Backport #28337 by @yp05327
Co-authored-by: yp05327 <576951401@qq.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
(cherry picked from commit 376fa0d8c4
2024-01-16 14:41:11 +00:00
d15f9ee0b0
Only check online runner when detecting matching runners in workflows ( #28286 ) ( #28512 )
...
Backport #28286 by @yp05327
Mentioned:
[#28277 ](https://github.com/go-gitea/gitea/issues/28277#issuecomment-1831325276 )
We should only check online runner when detecting matching runners in
workflows,
as if runner is not online, the workflow will not run.
Co-authored-by: yp05327 <576951401@qq.com>
(cherry picked from commit d9aeb1f09d
2023-12-22 12:10:03 +01:00
69bb6c6d71
Fix wrong link in `protect_branch_name_pattern_desc` ( #28313 ) ( #28315 )
...
Backport #28313 by @yp05327
The current href will link to
`https://domain/owner/repo/settings/branches/github.com/gobwas/glob `
Co-authored-by: yp05327 <576951401@qq.com>
(cherry picked from commit fee9c05ed3
2023-12-08 13:41:16 +01:00
c5bb91a9eb
Add guide page to actions when there's no workflows ( #28145 ) ( #28153 )
...
Backport #28145 by @yp05327
Before:
After:
Co-authored-by: yp05327 <576951401@qq.com>
(cherry picked from commit 9bfee5014b
2023-11-22 17:12:12 +01:00
4da95b7cf7
Fix empty action run title ( #28113 ) ( #28148 )
...
Backport #28113 by @lunny
Fix #27901
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
(cherry picked from commit c997e90738
2023-11-22 17:12:12 +01:00
e627592402
Fix typo in `packages.cleanup.success` ( #28133 ) ( #28136 )
...
Backport #28133 by @wolfogre
Follow
https://github.com/go-gitea/gitea/pull/28129#discussion_r1398971596
Co-authored-by: Jason Song <i@wolfogre.com>
(cherry picked from commit 117d9a117f
2023-11-22 17:12:12 +01:00
70fcf38205
Add missing `packages.cleanup.success` ( #28129 ) ( #28132 )
...
Backport #28129 by @wolfogre
Co-authored-by: Jason Song <i@wolfogre.com>
(cherry picked from commit f8c5f202b7
2023-11-22 17:12:12 +01:00
8869464c1d
Merge branch 'rebase-v1.21/forgejo-branding' into wip-v1.21-forgejo
2023-11-13 16:47:18 +01:00
30a15784d4
Merge branch 'rebase-v1.21/forgejo-dependency' into wip-v1.21-forgejo
2023-11-13 16:47:12 +01:00
2f84786d0c
Merge branch 'rebase-v1.21/forgejo-moderation' into wip-v1.21-forgejo
2023-11-13 16:47:07 +01:00
13c05ade07
Merge branch 'rebase-v1.21/forgejo-i18n' into wip-v1.21-forgejo
2023-11-13 16:47:01 +01:00
c712aaccea
[I18N] Move source locales to other folder
...
(cherry picked from commit d38ad85a05b94f9b8c1bc728ce8b322911286336bd4dc797c735889addf99eaf321db47b64ef0c9b6cd86bf244275dd36f58d5ace5a0aec067466f8c0d51a2228f4973e19dd3f553b4d54318312a6f74d09dc97f8b10c552e54eedf895e866786a486cfc2aa16d5cb91e940cf6cd7355f3a653e630328f5f4f819cb97c3ffdabd3eddf4fb860073826909cbbd9825f716578ce758e60e94fb8986b55043c590c432885ecc61f923c92f23757f13387855f975eade06c9f71fd91dd501a6db53d3a46a7
2023-11-13 13:57:47 +01:00
Gusted