Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into merge-decaf-history
Browse files Browse the repository at this point in the history
  • Loading branch information
brian-mann committed Jan 3, 2019
2 parents fc9f2bb + a7b8851 commit 686439a
Show file tree
Hide file tree
Showing 42 changed files with 1,224 additions and 620 deletions.
14 changes: 9 additions & 5 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,14 @@
"legacyDecorators": true
}
},
"overrides": {
"files": ["**/*.jsx"],
"rules": {
"arrow-body-style": "off",
"overrides": [
{
"files": [
"**/*.jsx"
],
"rules": {
"arrow-body-style": "off"
}
}
}
]
}
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
**/*
5 changes: 5 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Thanks for taking the time to contribute! :smile:
- [Branches](#branches)
- [Pull Requests](#pull-requests)
- [Testing](#testing)
- [Dependencies](#dependencies)
- [Deployment](#deployment)

## CI status
Expand Down Expand Up @@ -338,6 +339,10 @@ This repository is exhaustively tested by [CircleCI](https://circleci.com/gh/cyp

To run local tests, consult the `README.md` of each package.

### Dependencies

We use [RenovateBot](https://renovatebot.com/) to automatically upgrade our dependencies. The bot keeps chugging using settings in [renovate.json](renovate.json) to open PRs and if they pass merge patches. Minor and major updates require manual merge.

## Deployment

We will try to review and merge pull requests quickly. After merging we
Expand Down
Loading

0 comments on commit 686439a

Please sign in to comment.