(refs #1675)Drop debug option because it can't be configure at settings form
1 parent aab84d9 commit 134b5df6a23e6b9c127d1f93cf86824f0372e530
@Naoki Takezoe Naoki Takezoe authored on 2 Sep 2017
Showing 3 changed files
View
4
src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
"tls" -> trim(label("Enable TLS", optional(boolean()))),
"ssl" -> trim(label("Enable SSL", optional(boolean()))),
"keystore" -> trim(label("Keystore", optional(text())))
)(Ldap.apply)),
"skinName" -> trim(label("AdminLTE skin name", text(required))),
"debug" -> trim(label("Debug", boolean()))
"skinName" -> trim(label("AdminLTE skin name", text(required)))
)(SystemSettings.apply).verifying { settings =>
Vector(
if(settings.ssh && settings.baseUrl.isEmpty){
Some("baseUrl" -> "Base URL is required if SSH access is enabled.")
View
10
src/main/scala/gitbucket/core/service/SystemSettingsService.scala
ldap.keystore.foreach(x => props.setProperty(LdapKeystore, x))
}
}
props.setProperty(SkinName, settings.skinName.toString)
props.setProperty(Debug, settings.debug.toString)
using(new java.io.FileOutputStream(GitBucketConf)){ out =>
props.store(out, null)
}
}
getOptionValue(props, LdapKeystore, None)))
} else {
None
},
getValue(props, SkinName, "skin-blue"),
getValue(props, Debug, false)
getValue(props, SkinName, "skin-blue")
)
}
}
 
useSMTP: Boolean,
smtp: Option[Smtp],
ldapAuthentication: Boolean,
ldap: Option[Ldap],
skinName: String,
debug: Boolean){
skinName: String){
def baseUrl(request: HttpServletRequest): String = baseUrl.fold(request.baseUrl)(_.stripSuffix("/"))
 
def sshAddress:Option[SshAddress] =
for {
private val LdapTls = "ldap.tls"
private val LdapSsl = "ldap.ssl"
private val LdapKeystore = "ldap.keystore"
private val SkinName = "skinName"
private val Debug = "debug"
 
private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A = {
getSystemProperty(key).getOrElse(getEnvironmentVariable(key).getOrElse {
defining(props.getProperty(key)){ value =>
View
2
■■■
src/main/twirl/gitbucket/core/error.scala.html
@gitbucket.core.html.main("Error"){
<div class="content-wrapper main-center">
<div class="content body">
<h1>@title</h1>
@if(context.loginAccount.map{_.isAdmin}.getOrElse(false) || context.settings.debug){
@if(context.loginAccount.map{_.isAdmin}.getOrElse(false)){
@e.map { ex =>
<h2>@ex.getMessage</h2>
<table class="table table-condensed table-striped table-hover">
<tbody>