Skip to content

Commit

Permalink
Merge branch 'release/2.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
eliashaeussler committed Jan 3, 2023
2 parents e18a732 + 2285516 commit f121372
Show file tree
Hide file tree
Showing 10 changed files with 459 additions and 412 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/auto-merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,14 @@ jobs:
if: ${{ github.actor == 'dependabot[bot]' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: ahmadnassri/action-dependabot-auto-merge@v2
- name: Fetch metadata
id: dependabot-metadata
uses: dependabot/fetch-metadata@v1
with:
target: minor
github-token: ${{ secrets.MERGE_TOKEN }}
- name: Comment with merge instructions
if: ${{ steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' }}
uses: mshick/add-pr-comment@v2
with:
repo-token: ${{ secrets.MERGE_TOKEN }}
message: '@dependabot merge'
131 changes: 0 additions & 131 deletions ChangeLog

This file was deleted.

2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,3 @@ Please have a look at [`CONTRIBUTING.md`](CONTRIBUTING.md).
## :star: License

This project is licensed under [GNU General Public License 3.0 (or later)](LICENSE.md).

[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FCPS-IT%2Ffrontend-asset-handler.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2FCPS-IT%2Ffrontend-asset-handler?ref=badge_large)
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"phpstan/phpstan-symfony": "^1.1",
"phpstan/phpstan-webmozart-assert": "^1.2",
"phpunit/phpunit": "^9.5.5",
"rector/rector": "^0.14.7"
"rector/rector": "^0.15.0"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit f121372

Please sign in to comment.