Merge branch 'master' of github.com:Budibase/budibase into feature/rbac

6 years ago · 1d48d4ec50
3 changed files with 6 additions and 6 deletions
--- a/hosting/docker-compose.yaml
+++ b/hosting/docker-compose.yaml
@ -84,7 +84,7 @@ services:
      #- "4369:4369"
      #- "9100:9100"
    volumes:
-      - couchdb_data:/couchdb
+      - couchdb_data:/opt/couchdb/data
  couch-init:
    image: curlimages/curl
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@ -63,7 +63,7 @@
    }
  },
  "dependencies": {
-    "@budibase/bbui": "^1.58.2",
+    "@budibase/bbui": "^1.58.3",
    "@budibase/client": "^0.7.6",
    "@budibase/colorpicker": "1.0.1",
    "@budibase/string-templates": "^0.7.6",
--- a/packages/builder/yarn.lock
+++ b/packages/builder/yarn.lock
@ -842,10 +842,10 @@
    lodash "^4.17.19"
    to-fast-properties "^2.0.0"
-"@budibase/bbui@^1.58.2":
+"@budibase/bbui@^1.58.3":
-  version "1.58.2"
+  version "1.58.3"
-  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.58.2.tgz#1b9a5b1bf20597c1ea85ebba69acfec01ef6edce"
+  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.58.3.tgz#86ad6aa68eec7426e1ccdf1f7e7fc957cb57d3a3"
-  integrity sha512-Gn4yCNpoVhtVhRDuWEYdaBK/oAfccTvehywgbyH4sHKaY7aQ7v0679nsJsOHBjNPleKy5YN3ZLhneh5k3F1O2Q==
+  integrity sha512-PpbxfBhVpmP0EO1nPBhrz486EHCIgtJlXELC/ElzjG+FCQZSCvDSM7mq/97FOW35iYdTiQTlwFgOtvOgT1P8IQ==
  dependencies:
    markdown-it "^12.0.2"
    quill "^1.3.7"