diff --git a/.github/mergify.yml b/.github/mergify.yml index 569a0d81de..d86ba8ef54 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,17 +1,13 @@ queue_rules: - - name: default - conditions: + - name: default # automatic merge for master when reviewed and CI passes + queue_conditions: + - label=ready-to-merge + merge_conditions: - "#approved-reviews-by>=1" - base=master + merge_method: squash pull_request_rules: - - name: automatic merge for master when reviewed and CI passes - conditions: - - label=ready-to-merge - actions: - queue: - name: default - method: squash - name: delete head branch after merge conditions: - merged @@ -22,5 +18,5 @@ pull_request_rules: - conflict - -author~=^dependabot(|-preview)\[bot\]$ actions: - comment: - message: This pull request has a conflict. Could you fix it @{{author}}? + comment: + message: This pull request has a conflict. Could you fix it @{{author}}? diff --git a/apps/frontend/package.json b/apps/frontend/package.json index e2229fd062..45c600adf1 100644 --- a/apps/frontend/package.json +++ b/apps/frontend/package.json @@ -75,7 +75,7 @@ "html-loader": "^5.0.0", "inspecjs": "^2.11.0", "lodash": "4.17.21", - "lru-cache": "^10.1.0", + "lru-cache": "^11.0.2", "luxon": "^3.0.1", "mustache": "^4.2.0", "node-polyfill-webpack-plugin": "^2.0.1", diff --git a/yarn.lock b/yarn.lock index 6a87f08526..ab64018bf7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14372,16 +14372,21 @@ lowercase-keys@^1.0.0: resolved "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== -lru-cache@*, lru-cache@^10.0.1, lru-cache@^10.1.0, lru-cache@^10.2.0, lru-cache@^10.2.2, "lru-cache@^9.1.1 || ^10.0.0": - version "10.3.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.3.0.tgz#4a4aaf10c84658ab70f79a85a9a3f1e1fb11196b" - integrity sha512-CQl19J/g+Hbjbv4Y3mFNNXFEL/5t/KCg8POCuUqd4rMKjGG+j1ybER83hxV58zL+dFI1PTkt3GNFSHRt+d8qEQ== +lru-cache@*, lru-cache@^11.0.2: + version "11.0.2" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.0.2.tgz#fbd8e7cf8211f5e7e5d91905c415a3f55755ca39" + integrity sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA== "lru-cache@7.10.1 - 7.13.1": version "7.13.1" resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-7.13.1.tgz#267a81fbd0881327c46a81c5922606a2cfe336c4" integrity sha512-CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ== +lru-cache@^10.0.1, lru-cache@^10.2.0, lru-cache@^10.2.2, "lru-cache@^9.1.1 || ^10.0.0": + version "10.3.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.3.0.tgz#4a4aaf10c84658ab70f79a85a9a3f1e1fb11196b" + integrity sha512-CQl19J/g+Hbjbv4Y3mFNNXFEL/5t/KCg8POCuUqd4rMKjGG+j1ybER83hxV58zL+dFI1PTkt3GNFSHRt+d8qEQ== + lru-cache@^4.0.1, lru-cache@^4.1.2: version "4.1.5" resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"