feat: file resolvers + pull changes from master

2017-09-04 13:03:15 -04:00
parent 574e4b97f4
commit 35cb56c694
10 changed files with 459 additions and 313 deletions
--- a/server/modules/git.js
+++ b/server/modules/git.js
@@ -53,10 +53,9 @@ module.exports = {

    self.onReady = (wiki.IS_MASTER) ? self._initRepo() : Promise.resolve()

-    // Define signature
-
    if (wiki.config.git) {
-      self._signature.email = wiki.config.git.serverEmail || 'wiki@example.com'
+      self._repo.branch = appconfig.git.branch || 'master'
+      self._signature.email = appconfig.git.serverEmail || 'wiki@example.com'
    }

    return self