From 92d0925d5140f8687b255465b2c1dfa9ea061ca0 Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Sat, 8 Sep 2018 15:49:36 -0400 Subject: [PATCH] fix: mssql initial migration crash --- client/components/admin/admin-general.vue | 2 +- client/components/admin/admin-system.vue | 9 +- config.sample.yml | 3 +- dev/build/Dockerfile | 2 +- dev/docker/Dockerfile | 2 +- package.json | 37 +-- server/core/db.js | 2 + server/db/migrations/2.0.0.js | 24 +- server/graph/resolvers/system.js | 31 ++- server/models/authentication.js | 2 +- server/models/editors.js | 2 +- server/models/locales.js | 2 +- server/models/loggers.js | 2 +- server/models/renderers.js | 2 +- server/models/searchEngines.js | 2 +- server/models/settings.js | 2 +- server/models/storage.js | 2 +- yarn.lock | 302 +++++++++++++--------- 18 files changed, 254 insertions(+), 176 deletions(-) diff --git a/client/components/admin/admin-general.vue b/client/components/admin/admin-general.vue index 94987466..e7058df0 100644 --- a/client/components/admin/admin-general.vue +++ b/client/components/admin/admin-general.vue @@ -125,7 +125,7 @@ export default { metaRobots: ['Index', 'Follow', 'No Index', 'No Follow'], useSquareLogo: false, displayMascot: true, - featurePageRatings: false, + featurePageRatings: true, featurePersonalWiki: true } }, diff --git a/client/components/admin/admin-system.vue b/client/components/admin/admin-system.vue index 52f5fbd8..f686946f 100644 --- a/client/components/admin/admin-system.vue +++ b/client/components/admin/admin-system.vue @@ -97,11 +97,13 @@ v-avatar.indigo.darken-1(size='40') icon-database(fillColor='#FFFFFF') v-list-tile-content - v-list-tile-title {{ info.dbVersion }} + v-list-tile-title(v-html='dbVersion') v-list-tile-sub-title {{ info.dbHost }}