update chagelog

devmasx · Aug 29, 2021 · 854d3ac · 854d3ac
1 parent 1d21244
commit 854d3ac
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -19,15 +19,15 @@ 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
           target_branch: staging
           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'