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/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 diff --git a/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/package.json b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/package.json index 45f455d19106..0513f74a9709 100644 --- a/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/package.json +++ b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/package.json @@ -42,7 +42,7 @@ "karma-coverage-istanbul-reporter": "^1.2.1", "karma-jasmine": "~1.1.0", "karma-jasmine-html-reporter": "^0.2.2", - "protractor": "~5.1.2", + "protractor": "~5.3.2", "ts-node": "~3.2.0", "tslint": "~5.7.0", "typescript": "~2.4.2"