Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit d6cb367

Browse files
Merge master into dependabot/npm_and_yarn/eslint-6.7.2
2 parents 0164ffc + ffc3798 commit d6cb367

File tree

4 files changed

+860
-646
lines changed

4 files changed

+860
-646
lines changed

.github/workflows/automerge.yml

-31
This file was deleted.

.kodiak.toml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# .kodiak.toml
2+
# Minimal config. version is the only required field.
3+
version = 1
4+
5+
[merge]
6+
method = "merge"
7+
delete_branch_on_merge = true
8+
9+
# label to use to enable Kodiak to merge a PR
10+
automerge_label = "dependencies" # default: "automerge"
11+
12+
[merge.message]
13+
title = "pull_request_title"
14+
body = "pull_request_body"
15+
include_pr_number = true
16+
body_type = "markdown"
17+
strip_html_comments = true # remove html comments to auto remove PR templates

package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@
8787
},
8888
"devDependencies": {
8989
"@babel/preset-env": "^7.6.3",
90-
"@storybook/addon-actions": "^5.3.0-beta.3",
91-
"@storybook/addon-docs": "^5.3.0-beta.3",
92-
"@storybook/addon-info": "^5.3.0-beta.3",
93-
"@storybook/addon-links": "^5.3.0-beta.3",
94-
"@storybook/addons": "^5.3.0-beta.3",
90+
"@storybook/addon-actions": "^5.3.0-beta.16",
91+
"@storybook/addon-docs": "^5.3.0-beta.16",
92+
"@storybook/addon-info": "^5.3.0-beta.16",
93+
"@storybook/addon-links": "^5.3.0-beta.16",
94+
"@storybook/addons": "^5.3.0-beta.16",
9595
"@storybook/preset-typescript": "^1.1.0",
96-
"@storybook/react": "^5.3.0-beta.3",
96+
"@storybook/react": "^5.3.0-beta.16",
9797
"@types/jest": "^24.0.23",
9898
"@types/react": "^16.9.9",
9999
"@types/react-dom": "^16.9.2",

0 commit comments

Comments
 (0)