Skip to content

Commit 3a0ce12

Browse files
committed
Merge branch 'release/2.2.0'
2 parents 3ef5e6d + ca50a68 commit 3a0ce12

File tree

292 files changed

+2619
-1907
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

292 files changed

+2619
-1907
lines changed

.github/workflows/ci.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: ci
2+
on:
3+
push:
4+
branches:
5+
- master
6+
permissions:
7+
contents: write
8+
jobs:
9+
deploy:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v3
13+
- uses: actions/setup-python@v4
14+
with:
15+
python-version: 3.x
16+
- run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
17+
- uses: actions/cache@v3
18+
with:
19+
key: mkdocs-material-${{ env.cache_id }}
20+
path: .cache
21+
restore-keys: |
22+
mkdocs-material-
23+
- run: pip install mkdocs-material==9.0.9
24+
- run: pip install git+https://github.com/PauloASilva/mkdocs-monorepo-plugin@feat/i18n
25+
- run: mkdocs gh-deploy --force

2023/en/src/0xa8-lack-of-protection-from-automated-threats.md

Lines changed: 0 additions & 97 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 49 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
How to Contribute
2-
=================
1+
# How to Contribute
32

43
When contributing to this repository, please first discuss the change you wish
54
to make via submitting an issue with the owners of this repository before making
@@ -9,6 +8,7 @@ discussion.
98
## Branching Model
109

1110
This repository holds two main branches with an infinite lifetime:
11+
1212
* `master` is the default branch which always reflects the latest release.
1313
* `develop` is the main branch reflecting the latest delivered changes for the
1414
next release. When the `develop` branch reaches a stable point and is ready to
@@ -22,38 +22,58 @@ branches have a limited lifespan, since they will be removed eventually.
2222
Contributions to this repository are welcome. For ease of managing, please
2323
follow the steps below:
2424

25-
1. Fork this repository to your account.
25+
1. Fork this repository to your account.
26+
27+
2. Clone your copy of this repository, locally.
28+
29+
```
30+
git clone https://github.com/YOU/API-Security.git
31+
```
32+
33+
3. Create a new branch based on `develop` (e.g., `fix/foreword-section`).
34+
35+
```
36+
git checkout develop && git checkout -b fix/foreword-section
37+
```
38+
39+
4. Apply your changes.
40+
41+
Please, always follow our style conventions.
42+
43+
44+
Although there's an [`.editorconfig` file][1] on repository's root, your
45+
editor may not support it. To learn more about [EditorConfig][2] and text
46+
editors/IDEs support, check the website: https://editorconfig.org/.
47+
You can preview your changes, [rendering the web site locally][4].
48+
49+
5. Commit your changes.
50+
51+
1. Check modified files and add only required ones (e.g., build artifacts
52+
SHOULD NOT be tracked).
53+
2. The first line of the commit message should provide a brief description
54+
of your changes. You can go into more details on the optional commit
55+
message body.
2656
27-
2. Clone your copy of this repository, locally.
28-
```
29-
git clone https://github.com/YOU/API-Security.git
30-
```
31-
3. Create a new branch based on `develop` (e.g., `fix/foreword-section`).
32-
```
33-
git checkout develop && git checkout -b fix/foreword-section
34-
```
35-
4. Apply your changes.
57+
6. Push changes to your public repository.
3658
37-
Please, always follow our style conventions.
59+
```
60+
git push origin fix/foreword-section
61+
```
3862
39-
Although there's an [`.editorconfig` file][1] on repository's root, your
40-
editor may not support it. To learn more about [EditorConfig][2] and text
41-
editors/IDEs support, check the website: https://editorconfig.org/.
63+
7. Open a Pull Request from your `fix/foreword-section` to the upstream
64+
repository `develop` branch.
4265
43-
5. Commit your changes.
66+
### Rendering the Web Site Locally
4467
45-
1. Check modified files and add only required ones (e.g., build artifacts
46-
SHOULD NOT be tracked).
47-
2. The first line of the commit message should provide a brief description of
48-
your changes. You can go into more details on the optional commit message
49-
body.
68+
The web site is built using [Material for MkDocs][3] and several plugin.
69+
Although you can manually install everything, we've bundled everything into a
70+
Docker image that you can use to render the web site locally:
5071
51-
6. Push changes to your public repository.
52-
```
53-
git push origin fix/foreword-section
54-
```
55-
7. Open a Pull Request from your `fix/foreword-section` to the upstream
56-
repository `develop` branch.
72+
```
73+
docker compose up
74+
```
5775
58-
[1]: .editorconfig
76+
[1]: https://github.com/OWASP/API-Security/blob/master/.editorconfig
5977
[2]: https://editorconfig.org/
78+
[3]: https://squidfunk.github.io/mkdocs-material/
79+
[4]: #rendering-the-web-site-locally

Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM squidfunk/mkdocs-material:9.0.9
2+
3+
ENV MKDOCS_MONOREPO_REPO=https://github.com/PauloASilva/mkdocs-monorepo-plugin
4+
ENV MKDOCS_MONOREPO_BRANCH="feat/i18n"
5+
6+
RUN python -m pip install git+$MKDOCS_MONOREPO_REPO@$MKDOCS_MONOREPO_BRANCH
7+
RUN python -m pip install pymdown-extensions

0 commit comments

Comments
 (0)