From 854d3ac71ed1e9deb668e0074781b81fdd6e771f Mon Sep 17 00:00:00 2001 From: Miguel Savignano Date: Sun, 29 Aug 2021 19:30:45 +0200 Subject: [PATCH] update chagelog --- CHANGELOG.md | 5 +++++ README.md | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ce4373..7f2f82f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## v1.4.0 + +- Support Github Enterprise [#15](https://github.com/devmasx/merge-branch/pull/15) +- Bump addressable from 2.7.0 to 2.8.0 [#14](https://github.com/devmasx/merge-branch/pull/14) + ## v1.3.1 - Fix, check inputs with empty string values. diff --git a/README.md b/README.md index 0531574..8a2f93b 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@master - name: Merge development -> staging - uses: devmasx/merge-branch@v1.3.1 + uses: devmasx/merge-branch@v1.4.0 with: type: now from_branch: development @@ -27,7 +27,7 @@ jobs: github_token: ${{ github.token }} - name: Merge staging -> uat - uses: devmasx/merge-branch@v1.3.1 + uses: devmasx/merge-branch@v1.4.0 with: type: now from_branch: staging @@ -50,7 +50,7 @@ jobs: - uses: actions/checkout@master - name: Merge staging -> uat - uses: devmasx/merge-branch@v1.3.1 + uses: devmasx/merge-branch@v1.4.0 with: type: now target_branch: uat @@ -78,7 +78,7 @@ jobs: - uses: actions/checkout@master - name: Merge by labeled - uses: devmasx/merge-branch@v1.3.1 + uses: devmasx/merge-branch@v1.4.0 with: label_name: 'merged in develop' target_branch: 'develop'