fix: Incorrect git remote rm error

package.json

@@ -52,6 +52,7 @@
     "connect-mongo": "^1.3.2",
     "cookie-parser": "^1.4.3",
     "cron": "^1.2.1",
+    "diff2html": "^2.3.0",
     "execa": "^0.6.3",
     "express": "^4.15.2",
     "express-brute": "^1.0.1",

server/configure.js

@@ -221,8 +221,8 @@ module.exports = (port, spinner) => {
       },
       () => {
         if (req.body.gitUseRemote === false) { return false }
-        return exec.stdout('git', ['remote', 'remove', 'origin'], { cwd: gitDir }).catch(err => {
+        return exec.stdout('git', ['remote', 'rm', 'origin'], { cwd: gitDir }).catch(err => {
-          if (_.includes(err.message, 'No such remote')) {
+          if (_.includes(err.message, 'No such remote') || _.includes(err.message, 'Could not remove')) {
             return true
           } else {
             throw err

server/views/pages/view.pug

@@ -18,6 +18,9 @@ block rootNavRight
     a.button.is-outlined(href='/source/' + pageData.meta.path)
       i.icon-loader
       span Source
+    a.button.is-outlined(href='/diff/' + pageData.meta.path)
+      i.icon-flow-merge
+      span Diff
     if rights.write
       a.button(href='/edit/' + pageData.meta.path)
         i.icon-document-text