Skip to content

Commit 64e7630

Browse files
committed
Merge branch 'master' into features/saddleback-version
# Conflicts: # package-lock.json
2 parents 061f3fc + a199552 commit 64e7630

File tree

4 files changed

+372
-270
lines changed

4 files changed

+372
-270
lines changed

.github/dependabot.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,20 @@ updates:
33
- package-ecosystem: npm
44
directory: "/"
55
schedule:
6-
interval: monthly
7-
time: "04:00"
8-
open-pull-requests-limit: 10
6+
interval: "daily"
97
ignore:
108
- dependency-name: "@types/node-fetch"
119
- dependency-name: "node-fetch"
10+
- dependency-name: "camelcase"
11+
- dependency-name: "@angular-devkit/build-angular"
12+
- dependency-name: "@angular/animations"
13+
- dependency-name: "@angular/cli"
14+
- dependency-name: "@angular/common"
15+
- dependency-name: "@angular/compiler"
16+
- dependency-name: "@angular/compiler-cli"
17+
- dependency-name: "@angular/core"
18+
- dependency-name: "@angular/forms"
19+
- dependency-name: "@angular/platform-browser"
20+
- dependency-name: "@angular/platform-browser-dynamic"
21+
- dependency-name: "@angular/router"
22+
- dependency-name: "typescript"

.github/workflows/auto-merge.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: auto-merge
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
auto-merge:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v2
11+
- uses: ahmadnassri/action-dependabot-auto-merge@v2
12+
with:
13+
github-token: ${{ secrets.TOKEN }}

0 commit comments

Comments
 (0)