Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Thomas Pornin 2019-09-23 11:22:40 -04:00
commit db2a8214f7
2 changed files with 15 additions and 1 deletions

View File

@ -1,5 +1,5 @@
--- ---
Checks: '*,-llvm-header-guard,-hicpp-*,-readability-function-size,-google-readability-todo,-readability-magic-numbers,-cppcoreguidelines-avoid-magic-numbers,-readability-isolate-declaration' Checks: '*,-llvm-header-guard,-hicpp-*,-readability-function-size,-google-readability-todo,-readability-magic-numbers,-cppcoreguidelines-avoid-magic-numbers,-readability-isolate-declaration,-readability-uppercase-literal-suffix'
WarningsAsErrors: '*' WarningsAsErrors: '*'
HeaderFilterRegex: '.*' HeaderFilterRegex: '.*'
AnalyzeTemporaryDtors: false AnalyzeTemporaryDtors: false

14
.mergify.yml Normal file
View File

@ -0,0 +1,14 @@
pull_request_rules:
- name: Automatic merge
conditions:
- base=master
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- status-success=Travis CI - Pull Request
- status-success=Travis CI - Branch
- status-success=continuous-integration/appveyor/branch
- status-success=continuous-integration/appveyor/pr
- status-success=build
actions:
merge:
strict: smart