Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove duplicate option in admin screen and now-unused translation keys (#28492) #30024

Merged
merged 1 commit into from
Mar 23, 2024

Conversation

wxiaoguang
Copy link
Contributor

Backport #28492
Fix #30019

…ys (go-gitea#28492)

Resolves go-gitea#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>
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 23, 2024
@GiteaBot GiteaBot added this to the 1.21.10 milestone Mar 23, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 23, 2024
@github-actions github-actions bot added modifies/translation modifies/templates This PR modifies the template files labels Mar 23, 2024
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Mar 23, 2024
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Mar 23, 2024
@yardenshoham yardenshoham added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 23, 2024
@silverwind silverwind merged commit 01f736f into go-gitea:release/v1.21 Mar 23, 2024
27 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 23, 2024
@wxiaoguang wxiaoguang deleted the backport-sshkey-check branch March 23, 2024 15:04
TKaxv-7S added a commit to TKaxv-7S/gitea that referenced this pull request Apr 10, 2024
v1.21.10
* BUGFIXES
  * Fix Add/Remove WIP on pull request title failure (go-gitea#29999) (go-gitea#30066)
  * Fix misuse of `TxContext` (go-gitea#30061) (go-gitea#30062)
  * Respect DEFAULT_ORG_MEMBER_VISIBLE setting when adding creator to org (go-gitea#30013) (go-gitea#30035)
  * Escape paths for find file correctly (go-gitea#30026) (go-gitea#30031)
  * Remove duplicate option in admin screen and now-unused translation keys (go-gitea#28492) (go-gitea#30024)
  * Fix manual merge form and 404 page templates (go-gitea#30000)

# gpg: Signature made Tue, Mar 26, 2024  7:48:36 AM
# gpg:                using EDDSA key 8722B61D72341082553B201CB8BE6D610E61C862
# gpg: Can't check signature: No public key
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jun 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/templates This PR modifies the template files modifies/translation size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Disable Minimum Key Size Check shown as × despite MINIMUM_KEY_SIZE_CHECK = false
6 participants