summaryrefslogtreecommitdiffstats
path: root/modules/setting
diff options
context:
space:
mode:
Diffstat (limited to 'modules/setting')
-rw-r--r--modules/setting/repository.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/setting/repository.go b/modules/setting/repository.go
index 67dd805353..b5764f7fc4 100644
--- a/modules/setting/repository.go
+++ b/modules/setting/repository.go
@@ -44,6 +44,8 @@ var (
PrefixArchiveFiles bool
DisableMirrors bool
DefaultBranch string
+ AllowAdoptionOfUnadoptedRepositories bool
+ AllowDeleteOfUnadoptedRepositories bool
// Repository editor settings
Editor struct {
@@ -146,6 +148,7 @@ var (
DefaultRepoUnits: []string{},
PrefixArchiveFiles: true,
DisableMirrors: false,
+ DefaultBranch: "master",
// Repository editor settings
Editor: struct {
@@ -245,7 +248,7 @@ func newRepository() {
Repository.DisableHTTPGit = sec.Key("DISABLE_HTTP_GIT").MustBool()
Repository.UseCompatSSHURI = sec.Key("USE_COMPAT_SSH_URI").MustBool()
Repository.MaxCreationLimit = sec.Key("MAX_CREATION_LIMIT").MustInt(-1)
- Repository.DefaultBranch = sec.Key("DEFAULT_BRANCH").MustString("master")
+ Repository.DefaultBranch = sec.Key("DEFAULT_BRANCH").MustString(Repository.DefaultBranch)
RepoRootPath = sec.Key("ROOT").MustString(path.Join(homeDir, "gitea-repositories"))
forcePathSeparator(RepoRootPath)
if !filepath.IsAbs(RepoRootPath) {