Compare commits

..

No commits in common. "482ad78be441dba730c3d1e58f45cc8660f57d4c" and "52cef277ec4d6f8ab311af12b8e3572294fa5eac" have entirely different histories.

4 changed files with 6 additions and 2 deletions

View file

@ -87,6 +87,7 @@ var Service = struct {
ValidSiteURLSchemes []string ValidSiteURLSchemes []string
UsernameCooldownPeriod int64 UsernameCooldownPeriod int64
MaxUserRedirects int64 MaxUserRedirects int64
LandingPageInfoEnabled bool
// OpenID settings // OpenID settings
EnableOpenIDSignIn bool EnableOpenIDSignIn bool
@ -215,6 +216,7 @@ func loadServiceFrom(rootCfg ConfigProvider) {
if Service.EnableTimetracking { if Service.EnableTimetracking {
Service.DefaultEnableTimetracking = sec.Key("DEFAULT_ENABLE_TIMETRACKING").MustBool(true) Service.DefaultEnableTimetracking = sec.Key("DEFAULT_ENABLE_TIMETRACKING").MustBool(true)
} }
Service.LandingPageInfoEnabled = sec.Key("ENABLE_LANDING_PAGE_INFO").MustBool(true)
Service.DefaultEnableDependencies = sec.Key("DEFAULT_ENABLE_DEPENDENCIES").MustBool(true) Service.DefaultEnableDependencies = sec.Key("DEFAULT_ENABLE_DEPENDENCIES").MustBool(true)
Service.AllowCrossRepositoryDependencies = sec.Key("ALLOW_CROSS_REPOSITORY_DEPENDENCIES").MustBool(true) Service.AllowCrossRepositoryDependencies = sec.Key("ALLOW_CROSS_REPOSITORY_DEPENDENCIES").MustBool(true)
Service.DefaultAllowOnlyContributorsToTrackTime = sec.Key("DEFAULT_ALLOW_ONLY_CONTRIBUTORS_TO_TRACK_TIME").MustBool(true) Service.DefaultAllowOnlyContributorsToTrackTime = sec.Key("DEFAULT_ALLOW_ONLY_CONTRIBUTORS_TO_TRACK_TIME").MustBool(true)

View file

@ -58,7 +58,7 @@ func Home(ctx *context.Context) {
ctx.Redirect(setting.AppSubURL + "/user/login") ctx.Redirect(setting.AppSubURL + "/user/login")
return return
} }
ctx.Data["LandingPageInfoEnabled"] = setting.Service.LandingPageInfoEnabled
ctx.Data["PageIsHome"] = true ctx.Data["PageIsHome"] = true
ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled

View file

@ -11,6 +11,8 @@
</div> </div>
</div> </div>
</div> </div>
{{template "landing-page/landing-page" .}} {{if .LandingPageInfoEnabled}}
{{template "info/landing-page-info" .}}
{{end}}
</div> </div>
{{template "base/footer" .}} {{template "base/footer" .}}