Skip to content

Commit dc6f44e

Browse files
committed
Merge branch 'release/1.3.0' into master
2 parents 4e25470 + 88758c7 commit dc6f44e

21 files changed

+1093
-1337
lines changed

.github/dependabot.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Basic dependabot.yml file with
2+
# minimum configuration for two package managers
3+
4+
version: 2
5+
updates:
6+
# Enable version updates for npm
7+
- package-ecosystem: "npm"
8+
# Look for `package.json` and `lock` files in the `root` directory
9+
directory: "/"
10+
# Check the npm registry for updates every day (weekdays)
11+
schedule:
12+
interval: "daily"
13+
14+
# Enable version updates for Docker
15+
# - package-ecosystem: "docker"
16+
# # Look for a `Dockerfile` in the `root` directory
17+
# directory: "/"
18+
# # Check for updates once a week
19+
# schedule:
20+
# interval: "weekly"

.github/workflows/codeql-analysis.yml

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: "CodeQL"
2+
3+
on:
4+
push:
5+
branches: [develop, master]
6+
pull_request:
7+
# The branches below must be a subset of the branches above
8+
branches: [develop]
9+
schedule:
10+
- cron: '0 4 * * 0'
11+
12+
jobs:
13+
analyze:
14+
name: Analyze
15+
runs-on: ubuntu-latest
16+
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
# Override automatic language detection by changing the below list
21+
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
22+
language: ['javascript']
23+
# Learn more...
24+
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
25+
26+
steps:
27+
- name: Checkout repository
28+
uses: actions/checkout@v2
29+
with:
30+
# We must fetch at least the immediate parents so that if this is
31+
# a pull request then we can checkout the head.
32+
fetch-depth: 2
33+
34+
# If this run was triggered by a pull request event, then checkout
35+
# the head of the pull request instead of the merge commit.
36+
- run: git checkout HEAD^2
37+
if: ${{ github.event_name == 'pull_request' }}
38+
39+
# Initializes the CodeQL tools for scanning.
40+
- name: Initialize CodeQL
41+
uses: github/codeql-action/init@v1
42+
with:
43+
languages: ${{ matrix.language }}
44+
45+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
46+
# If this step fails, then you should remove it and run the build manually (see below)
47+
- name: Autobuild
48+
uses: github/codeql-action/autobuild@v1
49+
50+
# ℹ️ Command-line programs to run using the OS shell.
51+
# 📚 https://git.io/JvXDl
52+
53+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
54+
# and modify them (or add more) to build your code if your project
55+
# uses a compiled language
56+
57+
#- run: |
58+
# make bootstrap
59+
# make release
60+
61+
- name: Perform CodeQL Analysis
62+
uses: github/codeql-action/analyze@v1

README.md

+8-10
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,7 @@ describe('src/models/User', () => {
117117
checkModelName(User)('User')
118118

119119
context('properties', () => {
120-
;['age', 'firstname', 'lastname', 'email', 'token'].forEach(
121-
checkPropertyExists(user)
122-
)
120+
;['age', 'firstname', 'lastname', 'email', 'token'].forEach(checkPropertyExists(user))
123121
})
124122

125123
context('associations', () => {
@@ -142,14 +140,14 @@ describe('src/models/User', () => {
142140

143141
### Built-in checks
144142

145-
| Check | What it does |
146-
| --- | --- |
147-
| `checkHookDefined` | Checks that a particular hook is defined. |
148-
| `checkModelName` | Checks that the model is named correctly. |
149-
| `checkNonUniqueIndex` | Checks that a specific non-unique index is defined. |
150-
| `checkPropertyExists` | Checks that the model has defined the given property. |
143+
| Check | What it does |
144+
| -------------------------- | -------------------------------------------------------- |
145+
| `checkHookDefined` | Checks that a particular hook is defined. |
146+
| `checkModelName` | Checks that the model is named correctly. |
147+
| `checkNonUniqueIndex` | Checks that a specific non-unique index is defined. |
148+
| `checkPropertyExists` | Checks that the model has defined the given property. |
151149
| `checkUniqueCompoundIndex` | Checks that a specific unique compound index is defined. |
152-
| `checkUniqueIndex` | Checks that a specific unique index is defined. |
150+
| `checkUniqueIndex` | Checks that a specific unique index is defined. |
153151

154152
### Checking associations
155153

SECURITY.md

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Security Policy
2+
3+
## Supported Versions
4+
5+
| Version | Supported |
6+
| ------- | ------------------ |
7+
| 1.x | :white_check_mark: |
8+
| < 1.x | :x: |
9+
10+
## Reporting a Vulnerability
11+
12+
Report a vulnerability to [the author](https://about.me/davesag) directly.
13+
14+
You can expect to get an update on a reported vulnerability within 2 working days.
15+
16+
## Vulnerabilities in development dependencies
17+
18+
I'm using `dependabot` to scan for security issues and update dependencies in the `develop` branch regularly.

0 commit comments

Comments
 (0)