Browse Source

Merge pull request #16248 from abpframework/auto-merge/rel-7-1/1865

Merge branch rel-7.2 with rel-7.1
pull/16249/head
Masum ULU 4 years ago
committed by GitHub
parent
commit
05bb12d5fe
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      .github/workflows/auto-pr.yml
  2. 6
      docs/en/UI/Angular/DateTime-Format-Pipe.md

10
.github/workflows/auto-pr.yml

@ -1,4 +1,4 @@
name: Merge branch dev with rel-7.1 name: Merge branch rel-7.2 with rel-7.1
on: on:
push: push:
branches: branches:
@ -7,7 +7,7 @@ permissions:
contents: read contents: read
jobs: jobs:
merge-dev-with-rel-7-1: merge-rel-7-2-with-rel-7-1:
permissions: permissions:
contents: write # for peter-evans/create-pull-request to create branch contents: write # for peter-evans/create-pull-request to create branch
pull-requests: write # for peter-evans/create-pull-request to create a PR pull-requests: write # for peter-evans/create-pull-request to create a PR
@ -15,7 +15,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
ref: dev ref: rel-7.2
- name: Reset promotion branch - name: Reset promotion branch
run: | run: |
git fetch origin rel-7.1:rel-7.1 git fetch origin rel-7.1:rel-7.1
@ -24,7 +24,7 @@ jobs:
uses: peter-evans/create-pull-request@v3 uses: peter-evans/create-pull-request@v3
with: with:
branch: auto-merge/rel-7-1/${{github.run_number}} branch: auto-merge/rel-7-1/${{github.run_number}}
title: Merge branch dev with rel-7.1 title: Merge branch rel-7.2 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. 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}} reviewers: ${{github.actor}}
token: ${{ github.token }} token: ${{ github.token }}

6
docs/en/UI/Angular/DateTime-Format-Pipe.md

@ -14,21 +14,21 @@ ShortDate, ShortTime and ShortDateTime format data like angular's data pipe but
# ShortDate Pipe # ShortDate Pipe
```html ```html
<span>{{today | shortDatePipe }}</span> <span> {{today | shortDate }}</span>
``` ```
# ShortTime Pipe # ShortTime Pipe
```html ```html
<span>{{today | shortTimePipe }}</span> <span> {{today | shortTime }}</span>
``` ```
# ShortDateTime Pipe # ShortDateTime Pipe
```html ```html
<span>{{today | shortDateTimePipe }}</span> <span> {{today | shortDateTime }}</span>
``` ```
}%} }%}

Loading…
Cancel
Save