Browse Source

fix #1987

pull/1992/head
Unknwon 9 years ago
parent
commit
9a0902523b
  1. 1
      conf/locale/locale_en-US.ini
  2. 436
      modules/bindata/bindata.go
  3. 6
      routers/repo/setting.go

1
conf/locale/locale_en-US.ini

@ -164,6 +164,7 @@ activate_account = Please activate your account
activate_email = Verify your e-mail address activate_email = Verify your e-mail address
reset_password = Reset your password reset_password = Reset your password
register_success = Register success, Welcome register_success = Register success, Welcome
register_notify = Welcome on board
[modal] [modal]
yes = Yes yes = Yes

436
modules/bindata/bindata.go

File diff suppressed because one or more lines are too long

6
routers/repo/setting.go

@ -85,6 +85,12 @@ func SettingsPost(ctx *middleware.Context, form auth.RepoSettingForm) {
} }
repo.Description = form.Description repo.Description = form.Description
repo.Website = form.Website repo.Website = form.Website
// Visibility of forked repository is forced sync with base repository.
if repo.IsFork {
form.Private = repo.BaseRepo.IsPrivate
}
visibilityChanged := repo.IsPrivate != form.Private visibilityChanged := repo.IsPrivate != form.Private
repo.IsPrivate = form.Private repo.IsPrivate = form.Private
if err := models.UpdateRepository(repo, visibilityChanged); err != nil { if err := models.UpdateRepository(repo, visibilityChanged); err != nil {

Loading…
Cancel
Save