Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/dateformat-5.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
RanVaknin authored Jun 20, 2024
2 parents 613ff5c + c2b253a commit 52245da
Show file tree
Hide file tree
Showing 3 changed files with 1,061 additions and 1,353 deletions.
6 changes: 3 additions & 3 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pull_request_rules:
- name: Automatically merge on CI success and review approval
conditions:
- base~=master|integ-tests
- base~=main|integ-tests
- "#approved-reviews-by>=1"
- approved-reviews-by=@aws-actions/aws-sdk-all
- -approved-reviews-by~=author
Expand All @@ -21,8 +21,8 @@ pull_request_rules:

- name: Automatically approve Dependabot PRs
conditions:
- base=master
- author~=^dependabot(|-preview)\[bot\]$
- base=main
- author=dependabot[bot]
- -title~=(WIP|wip)
- -label~=(blocked|do-not-merge)
- -merged
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
},
"devDependencies": {
"dotenv": "^16.0.3",
"eslint": "^8.32.0",
"eslint": "^8.56.0",
"eslint-config-google": "^0.14.0",
"eslint-config-prettier": "^8.6.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-promise": "^6.1.1",
"jest": "^27.3.0",
"jest": "^29.4.1",
"nock": "^13.3.0",
"prettier": "^2.8.3"
"prettier": "^2.8.4"
}
}
Loading

0 comments on commit 52245da

Please sign in to comment.