Skip to content

Commit

Permalink
Merge pull request #772 from blackflux/dev
Browse files Browse the repository at this point in the history 
[Gally]: master <- dev
  • Loading branch information
@simlu
simlu committed Sep 14, 2019
2 parents bb6fe09 + bc29707 commit f89d967
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 27 deletions.
7 changes: 5 additions & 2 deletions .gally.json
View file
Expand Up @@ -12,7 +12,10 @@
"protection": {
"$full-dev": {
"@": "$full",
"restrictions": {"users": ["simlu", "MrsFlux"]}
"restrictions": {
"users": ["simlu", "MrsFlux"],
"apps": ["dependabot-preview"]
}
},
"$full-master": {"@": "$full", "required_status_checks": {"strict": false}},
"$full": {
Expand All @@ -31,7 +34,7 @@
"require_code_owner_reviews": true,
"required_approving_review_count": 1
},
"restrictions": {"users": ["simlu"], "teams": []}
"restrictions": {"users": ["simlu"], "teams": [], "apps": []}
}
}
}
12 changes: 6 additions & 6 deletions package.json
View file
Expand Up @@ -44,12 +44,12 @@
"dependencies": {
"app-root-path": "2.2.1",
"glob": "7.1.4",
"joi-strict": "1.1.1",
"joi-strict": "1.1.2",
"js-yaml": "3.13.1",
"lambda-wrapper": "0.3.0",
"lodash.get": "4.4.2",
"node-tdd": "2.5.4",
"smart-fs": "1.9.12"
"node-tdd": "2.5.5",
"smart-fs": "1.9.13"
},
"licenses": [
{
Expand All @@ -62,8 +62,8 @@
"@babel/core": "7.6.0",
"@babel/plugin-proposal-object-rest-spread": "7.5.5",
"@babel/register": "7.6.0",
"@blackflux/eslint-plugin-rules": "1.3.9",
"@blackflux/robo-config-plugin": "2.6.5",
"@blackflux/eslint-plugin-rules": "1.3.10",
"@blackflux/robo-config-plugin": "2.6.7",
"babel-eslint": "10.0.3",
"chai": "4.2.0",
"coveralls": "3.0.6",
Expand All @@ -73,7 +73,7 @@
"eslint-plugin-json": "1.4.0",
"eslint-plugin-markdown": "1.0.0",
"eslint-plugin-mocha": "6.1.1",
"js-gardener": "2.0.88",
"js-gardener": "2.0.89",
"mocha": "6.2.0",
"nock": "11.3.4",
"nyc": "14.1.1",
Expand Down
68 changes: 49 additions & 19 deletions yarn.lock
View file
Expand Up @@ -167,17 +167,17 @@
lodash "^4.17.13"
to-fast-properties "^2.0.0"

"@blackflux/eslint-plugin-rules@1.3.9":
version "1.3.9"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.9.tgz#faca946ec87c835e75a00fba5526ca371b610647"
integrity sha512-OX+pXO8EXLzTKb5102+Tvacm22IQN5FmWi6rs1e0MzhQ/w4PhPlq8CYPHBsAdPQZXWP1U9hTccMzCw2N19r8wA==
"@blackflux/eslint-plugin-rules@1.3.10":
version "1.3.10"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.10.tgz#183e3d1d1b4e054e7a3b5f6b625911d286cc4bbe"
integrity sha512-0wvQpnQgY3O/Arnz4KQR9Dg7wx3Ttb1twWp9/E8TAI9Sc23CY3CTq877WILHWzYteAThmQkHGAepOPzlyu3NtQ==
dependencies:
smart-fs "1.9.11"
smart-fs "1.9.12"

"@blackflux/robo-config-plugin@2.6.5":
version "2.6.5"
resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-2.6.5.tgz#9603de38711b4663af2318769d6a7b7a75a91182"
integrity sha512-gxO7LywiimPn8JrgdoFZAdx0sinwmkLJDY4uV+X8HBlXaylqsPpOVQ9UkWXCNQBD32Y+DADiVxfi43CIIOKUOw==
"@blackflux/robo-config-plugin@2.6.7":
version "2.6.7"
resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-2.6.7.tgz#ab04180917713c7deeeaf4ce5ba4489d709666ba"
integrity sha512-MZ9kcShTjL/dfuo2qWaibHLbGC62YKqvIQq9D6EMV7JWie1TNk0ddOnYP9XlMx1X3tFRX85p+xasIr8nNtjI6Q==

"@hapi/address@2.x.x":
version "2.1.1"
Expand Down Expand Up @@ -3622,10 +3622,17 @@ joi-strict@1.1.1:
dependencies:
"@hapi/joi" "16.0.1"

js-gardener@2.0.88:
version "2.0.88"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.88.tgz#bcd67b2e19c5233e392765a0c2d61c836f867801"
integrity sha512-hPX1u3xvgmrmB5lorZdpyYqbRNEPCX0AnU03S88VcIn5G3Dt0PahahK1g8xl860aoB1/S1muNyE7aUztS1grvQ==
joi-strict@1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.1.2.tgz#6ccc94f615ccafb4bf707a7764b184ae152690a4"
integrity sha512-5FJarK5iGIUL4e+CBhvv4B9ptW2GcpUVkTKhNfwYNYMjG2UjQV2PGO5c5oQLUIS7s7ugO5Z9W5+LGuLfeQUqDA==
dependencies:
"@hapi/joi" "16.0.1"

js-gardener@2.0.89:
version "2.0.89"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.89.tgz#2ae4a3b21694d3b77c430f5758710b7394ea8c9c"
integrity sha512-GcaBsU92ZB+dyOB5NRMWI3B7BFwFez7fD3+insFzIUdi+oxUo+b7PeXNVmqvjbUQxlCCqsUVIs+6WdmlGWDFxQ==
dependencies:
chalk "2.4.2"
fancy-log "1.3.3"
Expand Down Expand Up @@ -4671,16 +4678,16 @@ node-pre-gyp@^0.12.0:
semver "^5.3.0"
tar "^4"

node-tdd@2.5.4:
version "2.5.4"
resolved "https://registry.yarnpkg.com/node-tdd/-/node-tdd-2.5.4.tgz#a08d4a0dee0f477b4e950b94b78cad332971ae3d"
integrity sha512-53osqpWlw4hDHYc0WVqgNMqeKQGmj9pvWyDChp9Ud4q8I/XyJOGYKDfE3OSeFGFSreG8mZlovDyeamV7uina3A==
node-tdd@2.5.5:
version "2.5.5"
resolved "https://registry.yarnpkg.com/node-tdd/-/node-tdd-2.5.5.tgz#3a40b31b8a8a5659fba023a06ed8652e3167d77a"
integrity sha512-quWBFiqMDb3ZsrHzIMS9A0/LMTGY7ViPVYak5wa+J0DlMFeNzXV2AfkzJVF2v3X6Ox4IWecx/p7dwrMMclvoCw==
dependencies:
callsites "3.1.0"
joi-strict "1.1.0"
joi-strict "1.1.1"
lodash.get "4.4.2"
nock "11.3.4"
smart-fs "1.9.11"
smart-fs "1.9.12"
timekeeper "2.2.0"
tmp "0.1.0"

Expand Down Expand Up @@ -6526,6 +6533,19 @@ smart-fs@1.9.12:
xml-js "1.6.11"
yaml-boost "1.9.15"

smart-fs@1.9.13:
version "1.9.13"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.9.13.tgz#0a20436a9d73632d436f55ce5c5c283833945322"
integrity sha512-JPldd1jdjaNGteajV/VzFm4JOvhYFDSbhSGPHyfO4S7vZBVEpSJis4rPRVOGiIp4di9/XgnsjG04b7rhaBGlcw==
dependencies:
fs-extra "8.1.0"
json-stringify-pretty-compact "2.0.0"
lodash.clonedeep "4.5.0"
lodash.isequal "4.5.0"
object-align "1.0.7"
xml-js "1.6.11"
yaml-boost "1.9.17"

snapdragon-node@^2.0.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
Expand Down Expand Up @@ -7659,6 +7679,16 @@ yaml-boost@1.9.15:
lodash.mergewith "4.6.2"
lodash.set "4.3.2"

yaml-boost@1.9.17:
version "1.9.17"
resolved "https://registry.yarnpkg.com/yaml-boost/-/yaml-boost-1.9.17.tgz#4cb1c7405aa55a48488e77c34a1772c58e62d2d6"
integrity sha512-4pPqz1pt07W3QMeQ/yZs7NuatgfH0pQGlUnzJR53uw34EvgocD1YvBZZ5WPrdO5dqVuz84zZLmFMQJHoPPrOPw==
dependencies:
js-yaml "3.13.1"
lodash.get "4.4.2"
lodash.mergewith "4.6.2"
lodash.set "4.3.2"

yargs-parser@13.0.0:
version "13.0.0"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.0.0.tgz#3fc44f3e76a8bdb1cc3602e860108602e5ccde8b"
Expand Down

0 comments on commit f89d967

Please sign in to comment.