fix: Updated setup wizard to use new git author options
This commit is contained in:
@@ -61,8 +61,8 @@ jQuery(document).ready(function ($) {
|
||||
gitAuthUser: '',
|
||||
gitAuthPass: '',
|
||||
gitAuthSSL: true,
|
||||
gitSignatureName: '',
|
||||
gitSignatureEmail: '',
|
||||
gitShowUserEmail: true,
|
||||
gitServerEmail: '',
|
||||
adminEmail: '',
|
||||
adminPassword: '',
|
||||
adminPasswordConfirm: ''
|
||||
@@ -119,6 +119,8 @@ jQuery(document).ready(function ($) {
|
||||
if (appconfig.git !== false && _.isPlainObject(appconfig.git)) {
|
||||
this.conf.gitUrl = appconfig.git.url || ''
|
||||
this.conf.gitBranch = appconfig.git.branch || 'master'
|
||||
this.conf.gitShowUserEmail = (appconfig.git.showUserEmail !== false)
|
||||
this.conf.gitServerEmail = appconfig.git.serverEmail || ''
|
||||
if (_.isPlainObject(appconfig.git.auth)) {
|
||||
this.conf.gitAuthType = appconfig.git.auth.type || 'ssh'
|
||||
this.conf.gitAuthSSHKey = appconfig.git.auth.privateKey || ''
|
||||
@@ -126,10 +128,6 @@ jQuery(document).ready(function ($) {
|
||||
this.conf.gitAuthPass = appconfig.git.auth.password || ''
|
||||
this.conf.gitAuthSSL = (appconfig.git.auth.sslVerify !== false)
|
||||
}
|
||||
if (_.isPlainObject(appconfig.git.signature)) {
|
||||
this.conf.gitSignatureName = appconfig.git.signature.name || ''
|
||||
this.conf.gitSignatureEmail = appconfig.git.signature.email || ''
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
Reference in New Issue
Block a user