From 83546707085af9b59bdefdfbb2dc5511dadb57d7 Mon Sep 17 00:00:00 2001 From: zeripath Date: Thu, 16 Dec 2021 19:01:14 +0000 Subject: Prevent hang in git cat-file if repository is not a valid repository and other fixes (#17991) This PR contains multiple fixes. The most important of which is: * Prevent hang in git cat-file if the repository is not a valid repository Unfortunately it appears that if git cat-file is run in an invalid repository it will hang until stdin is closed. This will result in deadlocked /pulls pages and dangling git cat-file calls if a broken repository is tried to be reviewed or pulls exists for a broken repository. Fix #14734 Fix #9271 Fix #16113 Otherwise there are a few small other fixes included which this PR was initially intending to fix: * Fix panic on partial compares due to missing PullRequestWorkInProgressPrefixes * Fix links on pulls pages due to regression from #17551 - by making most /issues routes match /pulls too - Fix #17983 * Fix links on feeds pages due to another regression from #17551 but also fix issue with syncing tags - Fix #17943 * Add missing locale entries for oauth group claims * Prevent NPEs if ColorFormat is called on nil users, repos or teams. --- options/locale/locale_en-US.ini | 3 +++ 1 file changed, 3 insertions(+) (limited to 'options') diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 685b219ce1..28ac4d55fc 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2532,6 +2532,9 @@ auths.oauth2_required_claim_name = Required Claim Name auths.oauth2_required_claim_name_helper = Set this name to restrict login from this source to users with a claim with this name auths.oauth2_required_claim_value = Required Claim Value auths.oauth2_required_claim_value_helper = Set this value to restrict login from this source to users with a claim with this name and value +auths.oauth2_group_claim_name = Claim name providing group names for this source. (Optional) +auths.oauth2_admin_group = Group Claim value for administrator users. (Optional - requires claim name above) +auths.oauth2_restricted_group = Group Claim value for restricted users. (Optional - requires claim name above) auths.enable_auto_register = Enable Auto Registration auths.sspi_auto_create_users = Automatically create users auths.sspi_auto_create_users_helper = Allow SSPI auth method to automatically create new accounts for users that login for the first time -- cgit v1.2.3