diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/auth/repo_form.go | 5 | ||||
| -rw-r--r-- | modules/setting/setting.go | 42 |
2 files changed, 25 insertions, 22 deletions
diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index 58be0ec3ae..1a67f2b884 100644 --- a/modules/auth/repo_form.go +++ b/modules/auth/repo_form.go @@ -14,7 +14,7 @@ import ( "github.com/Unknwon/com" "github.com/go-macaron/binding" - "gopkg.in/macaron.v1" + macaron "gopkg.in/macaron.v1" ) // _______________________________________ _________.______________________ _______________.___. @@ -120,7 +120,8 @@ type RepoSettingForm struct { IsArchived bool // Admin settings - EnableHealthCheck bool + EnableHealthCheck bool + EnableCloseIssuesViaCommitInAnyBranch bool } // Validate validates the fields diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 0e3dc46882..d3b45ec29d 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -190,16 +190,17 @@ var ( // Repository settings Repository = struct { - AnsiCharset string - ForcePrivate bool - DefaultPrivate string - MaxCreationLimit int - MirrorQueueLength int - PullRequestQueueLength int - PreferredLicenses []string - DisableHTTPGit bool - AccessControlAllowOrigin string - UseCompatSSHURI bool + AnsiCharset string + ForcePrivate bool + DefaultPrivate string + MaxCreationLimit int + MirrorQueueLength int + PullRequestQueueLength int + PreferredLicenses []string + DisableHTTPGit bool + AccessControlAllowOrigin string + UseCompatSSHURI bool + DefaultCloseIssuesViaCommitsInAnyBranch bool // Repository editor settings Editor struct { @@ -227,16 +228,17 @@ var ( WorkInProgressPrefixes []string } `ini:"repository.pull-request"` }{ - AnsiCharset: "", - ForcePrivate: false, - DefaultPrivate: RepoCreatingLastUserVisibility, - MaxCreationLimit: -1, - MirrorQueueLength: 1000, - PullRequestQueueLength: 1000, - PreferredLicenses: []string{"Apache License 2.0,MIT License"}, - DisableHTTPGit: false, - AccessControlAllowOrigin: "", - UseCompatSSHURI: false, + AnsiCharset: "", + ForcePrivate: false, + DefaultPrivate: RepoCreatingLastUserVisibility, + MaxCreationLimit: -1, + MirrorQueueLength: 1000, + PullRequestQueueLength: 1000, + PreferredLicenses: []string{"Apache License 2.0,MIT License"}, + DisableHTTPGit: false, + AccessControlAllowOrigin: "", + UseCompatSSHURI: false, + DefaultCloseIssuesViaCommitsInAnyBranch: false, // Repository editor settings Editor: struct { |