Merge master into dependabot/npm_and_yarn/eslint-6.7.2

NateRadebaugh · Dec 6, 2019 · d6cb367 · d6cb367
2 parents 0164ffc + ffc3798
commit d6cb367
Show file tree

Hide file tree

Showing 4 changed files with 860 additions and 646 deletions.
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
diff --git a/.kodiak.toml b/.kodiak.toml
@@ -0,0 +1,17 @@
+# .kodiak.toml
+# Minimal config. version is the only required field.
+version = 1
+
+[merge]
+method = "merge"
+delete_branch_on_merge = true
+
+# label to use to enable Kodiak to merge a PR
+automerge_label = "dependencies" # default: "automerge"
+
+[merge.message]
+title = "pull_request_title"
+body = "pull_request_body"
+include_pr_number = true
+body_type = "markdown"
+strip_html_comments = true # remove html comments to auto remove PR templates
diff --git a/package.json b/package.json
@@ -87,13 +87,13 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.6.3",
-    "@storybook/addon-actions": "^5.3.0-beta.3",
-    "@storybook/addon-docs": "^5.3.0-beta.3",
-    "@storybook/addon-info": "^5.3.0-beta.3",
-    "@storybook/addon-links": "^5.3.0-beta.3",
-    "@storybook/addons": "^5.3.0-beta.3",
+    "@storybook/addon-actions": "^5.3.0-beta.16",
+    "@storybook/addon-docs": "^5.3.0-beta.16",
+    "@storybook/addon-info": "^5.3.0-beta.16",
+    "@storybook/addon-links": "^5.3.0-beta.16",
+    "@storybook/addons": "^5.3.0-beta.16",
     "@storybook/preset-typescript": "^1.1.0",
-    "@storybook/react": "^5.3.0-beta.3",
+    "@storybook/react": "^5.3.0-beta.16",
     "@types/jest": "^24.0.23",
     "@types/react": "^16.9.9",
     "@types/react-dom": "^16.9.2",