Skip to content

Commit

Permalink
Merge pull request #16248 from abpframework/auto-merge/rel-7-1/1865
Browse files Browse the repository at this point in the history
Merge branch rel-7.2 with rel-7.1
  • Loading branch information
masum-ulu authored Apr 12, 2023
2 parents 9b56403 + 6cf1882 commit 05bb12d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/auto-pr.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Merge branch dev with rel-7.1
name: Merge branch rel-7.2 with rel-7.1
on:
push:
branches:
Expand All @@ -7,15 +7,15 @@ permissions:
contents: read

jobs:
merge-dev-with-rel-7-1:
merge-rel-7-2-with-rel-7-1:
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
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
ref: dev
ref: rel-7.2
- name: Reset promotion branch
run: |
git fetch origin rel-7.1:rel-7.1
Expand All @@ -24,7 +24,7 @@ jobs:
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.
title: Merge branch rel-7.2 with rel-7.1
body: This PR generated automatically to merge rel-7.2 with rel-7.1. Please review the changed files before merging to prevent any errors that may occur.
reviewers: ${{github.actor}}
token: ${{ github.token }}
6 changes: 3 additions & 3 deletions docs/en/UI/Angular/DateTime-Format-Pipe.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ ShortDate, ShortTime and ShortDateTime format data like angular's data pipe but
# ShortDate Pipe

```html
<span>{{today | shortDatePipe }}</span>
<span> {{today | shortDate }}</span>
```


# ShortTime Pipe

```html
<span>{{today | shortTimePipe }}</span>
<span> {{today | shortTime }}</span>
```


# ShortDateTime Pipe

```html
<span>{{today | shortDateTimePipe }}</span>
<span> {{today | shortDateTime }}</span>
```

}%}

0 comments on commit 05bb12d

Please sign in to comment.