linden123/githaven-fork
1
1
Fork 0
forked from Shiloh/githaven
Code Pull Requests Activity

fix #1987

Browse Source
This commit is contained in:
Unknwon 2015-11-18 15:01:11 -05:00
parent d2808e38fe
commit 9a0902523b
3 changed files with 225 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf/locale/locale_en-US.ini
View File

@ -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
View File

File diff suppressed because one or more lines are too long

6
routers/repo/setting.go
View File

@ -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 {