Skip to content

Commit

Permalink
Merge branch 'refs/heads/4.3' into dev/fix-chromedriver-version
Browse files Browse the repository at this point in the history
  • Loading branch information
dotani1111 committed Sep 10, 2024
2 parents 46e284d + 404de17 commit 97bd9d9
Show file tree
Hide file tree
Showing 44 changed files with 133 additions and 13,789 deletions.
2 changes: 2 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ updates:
interval: "weekly"
allow:
- dependency-type: "all"
ignore:
- dependency-name: "twig/twig"

# GitHub アクションの依存関係を維持する
- package-ecosystem: "github-actions"
Expand Down
87 changes: 0 additions & 87 deletions .github/workflows/penetration-test.yml

This file was deleted.

7 changes: 7 additions & 0 deletions .github/workflows/zaproxy.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
name: OWASP ZAP

# このGitHub Actionsワークフローは手動でトリガー可能です。
# 手動で実行するには、以下の手順に従ってください:
# 1. GitHubリポジトリの「Actions」タブに移動します。
# 2. 「OWASP ZAP」ワークフローを選択します。
# 3. 「Run workflow」ボタンをクリックします。
# 4. 必要に応じて、表示される入力フォームでパラメータを指定し、「Run workflow」を再度クリックして実行します。
on:
workflow_dispatch:

Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"doctrine/persistence": "^3.1",
"ec-cube/plugin-installer": "^2.0",
"egulias/email-validator": "^4.0",
"exercise/htmlpurifier-bundle": "^4.1",
"exercise/htmlpurifier-bundle": "^5.0",
"friendsofphp/php-cs-fixer": "^3.8",
"guzzlehttp/guzzle": "^7.4.5",
"knplabs/knp-paginator-bundle": "^5.8",
Expand Down Expand Up @@ -99,9 +99,9 @@
"symfony/workflow": "^6.4",
"symfony/yaml": "^6.4",
"tecnickcom/tcpdf": "^6.2",
"twig/extra-bundle": "^3.3",
"twig/extra-bundle": "3.8.0",
"twig/intl-extra": "^3.3",
"twig/twig": "^3.8",
"twig/twig": "3.8.0",
"vlucas/phpdotenv": "v5.6.0"
},
"require-dev": {
Expand Down
Loading

0 comments on commit 97bd9d9

Please sign in to comment.