Update remaining new whitelist -> allowlist refs

Author: Henry Goodman

models/git/protected_branch.go

@@ -553,7 +553,7 @@ func removeIDsFromProtectedBranch(ctx context.Context, p *ProtectedBranch, userI
 func RemoveUserIDFromProtectedBranch(ctx context.Context, p *ProtectedBranch, userID int64) error {
 	columnNames := []string{
 		"whitelist_user_i_ds",
-		"force_push_whitelist_user_i_ds",
+		"force_push_allowlist_user_i_ds",
 		"merge_whitelist_user_i_ds",
 		"approvals_whitelist_user_i_ds",
 	}
@@ -564,7 +564,7 @@ func RemoveUserIDFromProtectedBranch(ctx context.Context, p *ProtectedBranch, us
 func RemoveTeamIDFromProtectedBranch(ctx context.Context, p *ProtectedBranch, teamID int64) error {
 	columnNames := []string{
 		"whitelist_team_i_ds",
-		"force_push_whitelist_team_i_ds",
+		"force_push_allowlist_team_i_ds",
 		"merge_whitelist_team_i_ds",
 		"approvals_whitelist_team_i_ds",
 	}

options/locale/locale_en-US.ini

@@ -2387,7 +2387,7 @@ settings.protect_whitelist_committers_desc = Only allowlisted users or teams wil
 settings.protect_whitelist_deploy_keys = Allowlist deploy keys with write access to push.
 settings.protect_whitelist_users = Allowlisted users for pushing:
 settings.protect_whitelist_teams = Allowlisted teams for pushing:
-settings.protect_force_push_whitelist_users = Allowlisted users for force pushing:
+settings.protect_force_push_allowlist_users = Allowlisted users for force pushing:
 settings.protect_force_push_allowlist_teams = Allowlisted teams for force pushing:
 settings.protect_force_push_allowlist_deploy_keys = Allowlist deploy keys with push access to force push.
 settings.protect_merge_whitelist_committers = Enable Merge Allowlist

routers/web/repo/setting/protected_branch.go

@@ -77,7 +77,7 @@ func SettingsProtectedBranch(c *context.Context) {
 	}
 	c.Data["Users"] = users
 	c.Data["whitelist_users"] = strings.Join(base.Int64sToStrings(rule.WhitelistUserIDs), ",")
-	c.Data["force_push_whitelist_users"] = strings.Join(base.Int64sToStrings(rule.ForcePushAllowlistUserIDs), ",")
+	c.Data["force_push_allowlist_users"] = strings.Join(base.Int64sToStrings(rule.ForcePushAllowlistUserIDs), ",")
 	c.Data["merge_whitelist_users"] = strings.Join(base.Int64sToStrings(rule.MergeWhitelistUserIDs), ",")
 	c.Data["approvals_whitelist_users"] = strings.Join(base.Int64sToStrings(rule.ApprovalsWhitelistUserIDs), ",")
 	c.Data["status_check_contexts"] = strings.Join(rule.StatusCheckContexts, "\n")

templates/repo/settings/protected_branch.tmpl

@@ -97,31 +97,31 @@
 				<h5 class="ui dividing header">{{ctx.Locale.Tr "repo.settings.event_force_push"}}</h5>
 				<div class="field">
 					<div class="ui radio checkbox">
-						<input type="radio" name="enable_force_push" value="none" class="toggle-target-disabled" data-target="#force_push_whitelist_box" {{if not .Rule.CanForcePush}}checked{{end}}>
+						<input type="radio" name="enable_force_push" value="none" class="toggle-target-disabled" data-target="#force_push_allowlist_box" {{if not .Rule.CanForcePush}}checked{{end}}>
 						<label>{{ctx.Locale.Tr "repo.settings.protect_disable_force_push"}}</label>
 						<p class="help">{{ctx.Locale.Tr "repo.settings.protect_disable_force_push_desc"}}</p>
 					</div>
 				</div>
 				<div class="field">
 					<div class="ui radio checkbox">
-						<input type="radio" name="enable_force_push" value="all" class="toggle-target-disabled" data-target="#force_push_whitelist_box" {{if and (.Rule.CanForcePush) (not .Rule.EnableForcePushAllowlist)}}checked{{end}}>
+						<input type="radio" name="enable_force_push" value="all" class="toggle-target-disabled" data-target="#force_push_allowlist_box" {{if and (.Rule.CanForcePush) (not .Rule.EnableForcePushAllowlist)}}checked{{end}}>
 						<label>{{ctx.Locale.Tr "repo.settings.protect_enable_force_push_all"}}</label>
 						<p class="help">{{ctx.Locale.Tr "repo.settings.protect_enable_force_push_all_desc"}}</p>
 					</div>
 				</div>
 				<div class="grouped fields">
 					<div class="field">
 						<div class="ui radio checkbox">
-							<input type="radio" name="enable_force_push" value="whitelist" class="toggle-target-enabled" data-target="#force_push_whitelist_box" {{if and (.Rule.CanForcePush) (.Rule.EnableForcePushAllowlist)}}checked{{end}}>
+							<input type="radio" name="enable_force_push" value="whitelist" class="toggle-target-enabled" data-target="#force_push_allowlist_box" {{if and (.Rule.CanForcePush) (.Rule.EnableForcePushAllowlist)}}checked{{end}}>
 							<label>{{ctx.Locale.Tr "repo.settings.protect_enable_force_push_allowlist"}}</label>
 							<p class="help">{{ctx.Locale.Tr "repo.settings.protect_enable_force_push_allowlist_desc"}}</p>
 						</div>
 					</div>
-					<div id="force_push_whitelist_box" class="grouped fields {{if not .Rule.EnableForcePushAllowlist}}disabled{{end}}">
+					<div id="force_push_allowlist_box" class="grouped fields {{if not .Rule.EnableForcePushAllowlist}}disabled{{end}}">
 						<div class="checkbox-sub-item field">
-							<label>{{ctx.Locale.Tr "repo.settings.protect_force_push_whitelist_users"}}</label>
+							<label>{{ctx.Locale.Tr "repo.settings.protect_force_push_allowlist_users"}}</label>
 							<div class="ui multiple search selection dropdown">
-								<input type="hidden" name="force_push_whitelist_users" value="{{.force_push_whitelist_users}}">
+								<input type="hidden" name="force_push_allowlist_users" value="{{.force_push_allowlist_users}}">
 								<div class="default text">{{ctx.Locale.Tr "search.user_kind"}}</div>
 								<div class="menu">
 									{{range .Users}}

tests/integration/git_test.go

@@ -481,7 +481,7 @@ func doProtectBranch(ctx APITestContext, branch, userToWhitelistPush, userToWhit
 		if userToWhitelistForcePush != "" {
 			user, err := user_model.GetUserByName(db.DefaultContext, userToWhitelistForcePush)
 			assert.NoError(t, err)
-			formData["force_push_whitelist_users"] = strconv.FormatInt(user.ID, 10)
+			formData["force_push_allowlist_users"] = strconv.FormatInt(user.ID, 10)
 			formData["enable_force_push"] = "whitelist"
 			formData["enable_force_push_allowlist"] = "on"
 		}