diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 000000000000..fac2166e311e --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,7 @@ +pull_request_rules: + - name: Automatic merge on approval + conditions: + - "#approved-reviews-by>=1" + actions: + merge: + method: merge diff --git a/aws-modules/pom.xml b/aws-modules/pom.xml index 72c5017c32ad..1c5f8ded226f 100644 --- a/aws-modules/pom.xml +++ b/aws-modules/pom.xml @@ -22,7 +22,7 @@ - 1.12.331 + 1.12.415 3.0.0 diff --git a/json-modules/json/src/main/webapp/package.json b/json-modules/json/src/main/webapp/package.json index 5dae00059373..f321fc1db53a 100644 --- a/json-modules/json/src/main/webapp/package.json +++ b/json-modules/json/src/main/webapp/package.json @@ -4,8 +4,8 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "typings": "0.6.5", - "jsonforms": "0.0.19", + "typings": "0.7.0", + "jsonforms": "0.0.20", "bootstrap": "3.3.6" } } \ No newline at end of file