Skip to content

Commit b4782e2

Browse files
authored
Return nicer error for ForcePrivate (#17971)
1 parent 8e9140d commit b4782e2

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

options/locale/locale_en-US.ini

+1
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,7 @@ lang_select_error = Select a language from the list.
443443
username_been_taken = The username is already taken.
444444
username_change_not_local_user = Non-local users are not allowed to change their username.
445445
repo_name_been_taken = The repository name is already used.
446+
repository_force_private = Force Private is enabled: private repositories cannot be made public.
446447
repository_files_already_exist = Files already exist for this repository. Contact the system administrator.
447448
repository_files_already_exist.adopt = Files already exist for this repository and can only be Adopted.
448449
repository_files_already_exist.delete = Files already exist for this repository. You must delete them.

routers/web/repo/setting.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func SettingsPost(ctx *context.Context) {
144144
visibilityChanged := repo.IsPrivate != form.Private
145145
// when ForcePrivate enabled, you could change public repo to private, but only admin users can change private to public
146146
if visibilityChanged && setting.Repository.ForcePrivate && !form.Private && !ctx.User.IsAdmin {
147-
ctx.ServerError("Force Private enabled", errors.New("cannot change private repository to public"))
147+
ctx.RenderWithErr(ctx.Tr("form.repository_force_private"), tplSettingsOptions, form)
148148
return
149149
}
150150

0 commit comments

Comments
 (0)