Skip to content

Commit b3bad78

Browse files
authored
Merge branch '4.3' into feature/plugin-e2e-playwright
2 parents 284b0f8 + 3d3b70a commit b3bad78

5 files changed

Lines changed: 40 additions & 32 deletions

File tree

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ updates:
44
directory: "/"
55
schedule:
66
interval: "weekly"
7+
cooldown:
8+
default-days: 5
79
allow:
810
- dependency-type: "all"
911
ignore:
@@ -21,12 +23,16 @@ updates:
2123
directory: "/"
2224
schedule:
2325
interval: "weekly"
26+
cooldown:
27+
default-days: 5
2428

2529
# npm の依存関係を維持する
2630
- package-ecosystem: "npm"
2731
directory: "/"
2832
schedule:
2933
interval: "weekly"
34+
cooldown:
35+
default-days: 5
3036
allow:
3137
- dependency-type: "all"
3238
ignore:

.github/workflows/dockerbuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
uses: ./.github/actions/composer
5858

5959
- name: Login to GitHub Container Registry
60-
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4
60+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
6161
with:
6262
registry: ghcr.io
6363
username: ${{ github.actor }}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"guzzlehttp/guzzle": "^7.4.5",
4343
"knplabs/knp-paginator-bundle": "^6.8",
4444
"mobiledetect/mobiledetectlib": "^2.8",
45-
"monolog/monolog": "^2.5",
45+
"monolog/monolog": "^2.11",
4646
"nanasess/bcmath-polyfill": "^1.0",
4747
"nesbot/carbon": "^3",
4848
"psr/cache": "^3.0",

composer.lock

Lines changed: 17 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 15 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)