Merge branch 'master' of github.com:getgridea/gridea

Change-Id: I30c1fa8fd6be44e64c57f79e00f554a6ffccc83a
getgridea · Aug 28, 2020 · 9a9141d · 9a9141d
2 parents acd0f54 + f9411c5
commit 9a9141d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -81,7 +81,7 @@ $ yarn electron:build
 ```
 
 
-## Contract
+## Contact
 [Telegram Channel](https://t.me/joinchat/AAAAAEj82_lma0Y1wmyqUQ) | [Telegram Group](https://t.me/joinchat/IDY0ahRqb8NPodv95BNpBg)  | QQ 1 Group: 970332209 | QQ 2 Group: 923131213 | Author Twitter: @EryouHao
 
 ## Example Screenshots

diff --git a/package.json b/package.json
@@ -98,7 +98,7 @@
     "@vue/eslint-config-typescript": "^4.0.0",
     "babel-eslint": "^10.0.1",
     "babel-plugin-prismjs": "^1.0.2",
-    "electron": "^7.1.2",
+    "electron": "^7.2.4",
     "eslint": "^5.16.0",
     "eslint-plugin-vue": "^5.2.2",
     "husky": "^1.3.1",

diff --git a/src/views/theme/includes/CustomSetting.vue b/src/views/theme/includes/CustomSetting.vue
@@ -260,7 +260,7 @@ export default class ThemeCustomSetting extends Vue {
       this.$set(this.form, key, this.site.themeCustomConfig[key])
     })
     this.currentThemeConfig.forEach((item: any) => {
-      if (!this.form[item.name]) {
+      if (this.form[item.name] === undefined) {
         this.$set(this.form, item.name, item.value)
       }
     })

diff --git a/yarn.lock b/yarn.lock
@@ -1009,11 +1009,7 @@
   resolved "http://registry.npm.taobao.org/@types/minimatch/download/@types/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha1-PcoOPzOyAPx9ETnAzZbBJoyt/Z0=
 
-"@types/node@*":
-  version "10.12.18"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.18.tgz#1d3ca764718915584fcd9f6344621b7672665c67"
-
-"@types/node@^12.0.12":
+"@types/node@*", "@types/node@^12.0.12":
   version "12.12.14"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.14.tgz#1c1d6e3c75dba466e0326948d56e8bd72a1903d2"
   integrity sha512-u/SJDyXwuihpwjXy7hOOghagLEV1KdAST6syfnOk6QZAMzZuWZqXy5aYYZbh8Jdpd4escVFP0MvftHNDb9pruA==
@@ -4292,10 +4288,10 @@ electron-updater@^4.2.0:
     pako "^1.0.10"
     semver "^6.3.0"
 
-electron@^7.1.2:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-7.1.3.tgz#9f6779846ced5b145b6303f10dcf4bf7f84e7f27"
-  integrity sha512-FdzGNR/tX0kC53lQnL7K+ZrxwrxKHf9i8KdL+O2LF5yXHJ3M8oZWc0OM1+nfqQUWCBoBV+7UblMF0+6E/tplEg==
+electron@^7.2.4:
+  version "7.2.4"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-7.2.4.tgz#9fc0446dae23ead897af8742470cb18da55c6ce9"
+  integrity sha512-Z+R692uTzXgP8AHrabE+kkrMlQJ6pnAYoINenwj9QSqaD2YbO8IuXU9DMCcUY0+VpA91ee09wFZJNUKYPMnCKg==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^12.0.12"
@@ -12020,8 +12016,9 @@ websocket-driver@>=0.5.1:
     websocket-extensions ">=0.1.1"
 
 websocket-extensions@>=0.1.1:
-  version "0.1.3"
-  resolved "http://registry.npm.taobao.org/websocket-extensions/download/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
 which-module@^2.0.0:
   version "2.0.0"