Skip to content

Commit 9fa01b8

Browse files
authored
Merge pull request #403 from owaspsamm/revert-402-fix/gitignore-resources
Revert "Fixes #401"
2 parents bd7ee7e + 0fb6cea commit 9fa01b8

13 files changed

Lines changed: 2 additions & 28 deletions

.github/workflows/staging-integration.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ permissions:
1010
contents: write
1111
pull-requests: write
1212
statuses: write
13-
actions: write
1413

1514
jobs:
1615
integrate:
@@ -75,17 +74,6 @@ jobs:
7574
7675
git push --force origin staging
7776
78-
- name: Trigger staging deploy
79-
uses: actions/github-script@v7
80-
with:
81-
script: |
82-
await github.rest.actions.createWorkflowDispatch({
83-
owner: context.repo.owner,
84-
repo: context.repo.repo,
85-
workflow_id: 'gh-pages.yaml',
86-
ref: 'staging'
87-
});
88-
8977
- name: Post statuses and comments
9078
if: always()
9179
uses: actions/github-script@v7

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ content/*/business-function/**
33

44
# Hugo generated
55
public/
6-
/resources/
6+
resources/
77
.hugo_build.lock
88

99
# Editor / OS

content/en/internal/cutover-handoff.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This protects `main` from direct pushes and accidental force-pushes once v2 is l
2121
1. Go to `github.com/owaspsamm/website`**Settings → Branches → Add branch protection rule**
2222
2. **Branch name pattern:** `main`
2323
3. Enable the following:
24-
-**Require a pull request before merging** — set required approvals to **1**, enable **"Require approval of the most recent reviewable push"** (GitHub prevents self-approval by default — no extra setting needed)
24+
-**Require a pull request before merging** — set required approvals to **1**, enable **"Do not allow approving your own pull request"**
2525
-**Require status checks to pass before merging** — search for and add **`deploy`**
2626
-**Require branches to be up to date before merging**
2727
-**Do not allow force pushes**
-148 KB
Binary file not shown.
-43.5 KB
Binary file not shown.

static/img/resources/Octocat.png

-2.03 MB
Binary file not shown.
-39.9 KB
Binary file not shown.

static/img/resources/mailchimp.png

-19.5 KB
Binary file not shown.

static/img/resources/meetup.png

-15 KB
Binary file not shown.
-47.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)