Skip to content

Commit

Permalink
Merge branch 'release/1.2.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
eliashaeussler committed Nov 2, 2022
2 parents d21af80 + bc102b5 commit 8d7ae2a
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 2 deletions.
15 changes: 15 additions & 0 deletions .github/workflows/auto-merge.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Dependabot auto-merge
on:
pull_request:
types: [opened]

jobs:
dependabot-auto-merge:
if: ${{ github.actor == 'dependabot[bot]' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: ahmadnassri/action-dependabot-auto-merge@v2
with:
target: minor
github-token: ${{ secrets.MERGE_TOKEN }}
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2022-11-02 [RELEASE] Release of frontend-asset-handler 1.2.6 (Elias Häußler)
2022-11-02 b573e13 [DOCS] Use less badges in README.md (Elias Häußler)
2022-11-01 2ed4e53 [TASK] Enable Dependabot auto-merge for minor and patch updates (Elias Häußler)

2022-10-31 [RELEASE] Release of frontend-asset-handler 1.2.5 (Elias Häußler)
2022-10-31 21683bf [TASK] Switch to `ncipollo/release-action` for new releases (Elias Häußler)
2022-10-31 b1d6d9b [TASK]: Bump phpstan/phpstan-phpunit from 1.2.1 to 1.2.2 (dependabot[bot])
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
# Frontend Asset Handler

[![Coverage](https://codecov.io/gh/CPS-IT/frontend-asset-handler/branch/develop/graph/badge.svg?token=P4F5YYWAJX)](https://codecov.io/gh/CPS-IT/frontend-asset-handler)
[![Maintainability](https://api.codeclimate.com/v1/badges/c4b7516380091c1e11a4/maintainability)](https://codeclimate.com/github/CPS-IT/frontend-asset-handler/maintainability)
[![Tests](https://github.com/CPS-IT/frontend-asset-handler/actions/workflows/tests.yaml/badge.svg)](https://github.com/CPS-IT/frontend-asset-handler/actions/workflows/tests.yaml)
[![CGL](https://github.com/CPS-IT/frontend-asset-handler/actions/workflows/cgl.yaml/badge.svg)](https://github.com/CPS-IT/frontend-asset-handler/actions/workflows/cgl.yaml)
[![Release](https://github.com/CPS-IT/frontend-asset-handler/actions/workflows/release.yaml/badge.svg)](https://github.com/CPS-IT/frontend-asset-handler/actions/workflows/release.yaml)
[![Latest Stable Version](http://poser.pugx.org/cpsit/frontend-asset-handler/v)](https://packagist.org/packages/cpsit/frontend-asset-handler)
[![Total Downloads](http://poser.pugx.org/cpsit/frontend-asset-handler/downloads)](https://packagist.org/packages/cpsit/frontend-asset-handler)
[![PHP Version Require](http://poser.pugx.org/cpsit/frontend-asset-handler/require/php)](https://packagist.org/packages/cpsit/frontend-asset-handler)
[![License](http://poser.pugx.org/cpsit/frontend-asset-handler/license)](LICENSE.md)

:package: [Packagist](https://packagist.org/packages/cpsit/frontend-asset-handler) |
Expand Down

0 comments on commit 8d7ae2a

Please sign in to comment.