(cherry picked from commit 2d67a9a62163957eef9dd26379a229b8af741655)
(cherry picked from commit 4eac51f6a4200e01aa72fa0eaac5d72d57ed0c8e)
(cherry picked from commit 34401a28f5d1180ac580c3410209b5291428a156)
(cherry picked from commit 7210b45a61f52b3c6396c339dc525d5b58c32b54)
(cherry picked from commit cc741116d2e1423d005869b244054b41b402dc3e)
(cherry picked from commit 67a160ef0abca208610d1395a2218aab26c181a3)
(cherry picked from commit adb258767259f3e8802485990a0625bc151f364b)
(cherry picked from commit 1b57a3d6011d4b9790199cc1beb4d2220f45bb09)
(cherry picked from commit 02fbbf05384190ca3f81e6bd920e3cbe2a9cd260)
(cherry picked from commit 164af88c4b002cc8fcaaba0551608a25236a836d)
(cherry picked from commit 5102d0aded75df2d171fbc9d5763f5918663fe7e)
(cherry picked from commit f1e1e620f475d2935c2cb487574af93a5e9bb90e)
(cherry picked from commit 2bd4ab7b4635fff63552c003782f05e63fb84f3d)
(cherry picked from commit 28b511a33a2b778cf456bfaae02dc431d3c4d48e)
(cherry picked from commit dc501ba1c160ed5c401c9e21fcfddd21ee00254d)
(cherry picked from commit 252d336537286da57ec486cb43906c026c72943a)
(cherry picked from commit 8208f11db036e2d80b28a03d523f766ed69bfa43)
(cherry picked from commit da711c70b59b1d464a773be95a67eee3360ec6a4)
(cherry picked from commit 62e9a4d9179dc11cb9752fc327fb5788a259b5a2)
(cherry picked from commit 7fe6e090735aa1df498c0b2b9a63b983906fa7ec)
(cherry picked from commit cfd6782313db3e1de219b5cd9d64a556234ea2c9)
(cherry picked from commit 5188e3a0f1eb502b4b6266a828cd06a8ec748a77)
(cherry picked from commit 5d741ae4406ddf04126e689d6320ef29b84bfeda)
(cherry picked from commit b8a72e0111ddc03c583daf6432dd6aa3e507c4f9)
(cherry picked from commit 2fbbf1ef8d4342260eede975e42264a8fde072bb)
(cherry picked from commit 33597ea6c0426c7d218e5fd3511e0582e9e3720e)
(cherry picked from commit 966e0cf8c01a23a7d58583214389d22d96900cd1)
(cherry picked from commit 38d0da916793d4e420f068bb934c5143292177f4)
(cherry picked from commit b740ebf5f6a4db0a802abf7ac1f731ca82b30bc6)
(cherry picked from commit 36e0978f6e2bd59a20752063480f1c85c07947ab)
(cherry picked from commit 98e157c22223b7e4f3dcad34824e7430104848a0)
(cherry picked from commit 1ec680eb7fbfda59bf6336ad83cfdfc98759f205)
(cherry picked from commit 23848b7ce739557cafd9f6aece789f10b7f308da)
(cherry picked from commit 431c925de486848a15b48d5bf8cd5af30ce1fb50)
(cherry picked from commit df9e026d9239f839ac0b8fd35614325ba183e468)
(cherry picked from commit 39d97780a109aeee81fe230053e0c43b68572b93)
(cherry picked from commit 7e266cce10d71dc443904668de41bfd226c99003)
(cherry picked from commit 516de5fd8f)
(cherry picked from commit 1bd5eba7e7)
(cherry picked from commit 45d01bcd389933a29a66ed237828a7b23bc87752)
(cherry picked from commit 71734355d0db1c3af671f7d37d09264a6626feed)
(cherry picked from commit 6a1a33c34c6c4467cd305bd9ec44a39cf1e93cf2)
(cherry picked from commit 829715aa21be078424a44f623bbbf62831fb7972)
(cherry picked from commit 7c06b5f9ea1efc569e4757d9ee76ece3b80c96ff)
(cherry picked from commit 90ab1b3c6294a9050c98be73a14db78e810fc180)
(cherry picked from commit cf6b103868913aec5f6795a268c74e3f07e7f760)
Fixes#27114.
* In Gitea 1.12 (#9532), a "dismiss stale approvals" branch protection
setting was introduced, for ignoring stale reviews when verifying the
approval count of a pull request.
* In Gitea 1.14 (#12674), the "dismiss review" feature was added.
* This caused confusion with users (#25858), as "dismiss" now means 2
different things.
* In Gitea 1.20 (#25882), the behavior of the "dismiss stale approvals"
branch protection was modified to actually dismiss the stale review.
For some users this new behavior of dismissing the stale reviews is not
desirable.
So this PR reintroduces the old behavior as a new "ignore stale
approvals" branch protection setting.
---------
Co-authored-by: delvh <dev.lh@web.de>
Mainly for MySQL/MSSQL.
It is important for Gitea to use case-sensitive database charset
collation. If the database is using a case-insensitive collation, Gitea
will show startup error/warning messages, and show the errors/warnings
on the admin panel's Self-Check page.
Make `gitea doctor convert` work for MySQL to convert the collations of
database & tables & columns.
* Fix#28131
## ⚠️ BREAKING ⚠️
It is not quite breaking, but it's highly recommended to convert the
database&table&column to a consistent and case-sensitive collation.
Resolves https://github.com/go-gitea/gitea/issues/28451.
This change follows the recommendation by wxiaoguang to remove the
"Disable Minimum Key Size Check" from the "Service Configuration"
section of the UI, because this option belongs to the "SSH
Configuration" section of the administration menu and already has a
functioning indicator in that section of the UI.
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Some translations are duplicated for the same package fields; it should
be possible to use the same approach. Checked packages to use the same
forms in templates.
1. Removed repeated translations for the same fields
2. Linked template files to the same translation fields
3. Added repository site link for nuget packages
* Show checkout instructions also when there is no permission to push,
for anyone who wants to locally test the changes.
* First checkout the branch exactly as is, without immediately having to
solve merge conflicts. Leave this to the merge step, since it's often
convenient to test a change without worrying about this.
* Use `git fetch -u`, so an existing local branch is updated when
re-testing the same pull request. But not the more risky `git fetch -f`
in to handle force pushes, as we don't want to accidentally overwrite
important local changes.
* Show different merge command depending on the chosen merge style,
interactively updated.
This PR will show the _noreply_ address in the privacy popup
_keep_email_private_popup_.
I had to look into the source code to figure out which E-Mail Adress I
had to use on gitea.com to hide it from public access.
According to the contribution guidelines I only updated the en-US
translation file.
Co-authored-by: Hakito <hakito@git.example.com>
Per the discussion on #22054, the flow for adding a new team member to
an org is not intuitive for new Gitea users.
The ideal solution would be to add a new button on the Org > Members
index view (see the screenshot mockup in the issue description).
However, this would require a refactor of the UX for the flow. The
current flow has an implicit context of which team within the org the
new member is being added to ('Owners' by default). From the Members
index, there is no implicit context; the flow would have to add a picker
for which team the new member should be added to.
So, as a stopgap, this change simply adds a button to the Teams index
page that performs the same action as clicking on the title of the team
(a behavior that is currently too obscure as indicated in the comments
on the issue). This should reduce support burden and serve as a decent
temporary measure until the Add Member flow is refactored.
---------
Co-authored-by: tomholford <tomholford@users.noreply.github.com>
