Merge pull request #16250 from abpframework/auto-merge/rel-7-2/1866

Merge branch dev with rel-7.2
pull/16251/head^2
Masum ULU 3 years ago committed by GitHub
commit 8b59fc7cbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,13 +1,13 @@
name: Merge branch dev with rel-7.1
name: Merge branch dev with rel-7.2
on:
push:
branches:
- rel-7.1
- rel-7.2
permissions:
contents: read
jobs:
merge-dev-with-rel-7-1:
merge-dev-with-rel-7-2:
permissions:
contents: write # for peter-evans/create-pull-request to create branch
pull-requests: write # for peter-evans/create-pull-request to create a PR
@ -18,13 +18,13 @@ jobs:
ref: dev
- name: Reset promotion branch
run: |
git fetch origin rel-7.1:rel-7.1
git reset --hard rel-7.1
git fetch origin rel-7.2:rel-7.2
git reset --hard rel-7.2
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
with:
branch: auto-merge/rel-7-1/${{github.run_number}}
title: Merge branch dev with rel-7.1
body: This PR generated automatically to merge dev with rel-7.1. Please review the changed files before merging to prevent any errors that may occur.
branch: auto-merge/rel-7-2/${{github.run_number}}
title: Merge branch dev with rel-7.2
body: This PR generated automatically to merge dev with rel-7.2. Please review the changed files before merging to prevent any errors that may occur.
reviewers: ${{github.actor}}
token: ${{ github.token }}

@ -22,7 +22,7 @@ Configure<CmsKitCommentOptions>(options =>
options.AllowedExternalUrls = new Dictionary<string, List<string>>
{
{
"quote",
"Product",
new List<string>
{
"https://abp.io/"

Loading…
Cancel
Save