Skip to content

Commit ad53277

Browse files
authored
Merge branch 'main' into feature/iac-scaffolding
2 parents 9a5d3bb + b842459 commit ad53277

File tree

10 files changed

+881
-850
lines changed

10 files changed

+881
-850
lines changed

.github/workflows/check-pr-issue.yaml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
11
name: Check PR linked issue and assignee
22

33
on:
4-
pull_request:
5-
types:
6-
- opened
7-
- synchronize
4+
- pull_request_target
85

96
permissions:
107
contents: read
11-
issues: write
8+
issues: read
129
pull-requests: write
1310

1411
jobs:
1512
check-pr-issue:
1613
runs-on: ubuntu-latest
1714

1815
steps:
19-
- uses: actions/checkout@v5
20-
2116
- name: Check PR linked issue and assignee
2217
uses: arkid15r/check-pr-issue-action@a3635191c798f111aae577759b579dc37bb13e02
2318
with:

.github/workflows/label-pull-requests.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ name: Label Pull Requests
33
on:
44
- pull_request_target
55

6+
permissions:
7+
contents: read
8+
pull-requests: write
9+
610
jobs:
711
labeler:
8-
permissions:
9-
contents: read
10-
pull-requests: write
1112
runs-on: ubuntu-latest
1213
steps:
1314
- uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repos:
1010
exclude: (.github|pnpm-lock.yaml)
1111

1212
- repo: https://github.com/astral-sh/ruff-pre-commit
13-
rev: v0.14.0
13+
rev: v0.14.1
1414
hooks:
1515
- id: ruff
1616
args:

backend/apps/api/rest/v0/__init__.py

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,15 @@
1818
from apps.api.rest.v0.sponsor import router as sponsor_router
1919

2020
ROUTERS = {
21-
# Chapters.
2221
"/chapters": chapter_router,
23-
# Committees.
2422
"/committees": committee_router,
25-
# Community.
26-
"/members": member_router,
27-
"/organizations": organization_router,
28-
# Events.
2923
"/events": event_router,
30-
# Issues.
3124
"/issues": issue_router,
32-
# Projects.
25+
"/members": member_router,
26+
"/organizations": organization_router,
3327
"/projects": project_router,
34-
# Releases.
3528
"/releases": release_router,
36-
# Repositories.
3729
"/repositories": repository_router,
38-
# Sponsors.
3930
"/sponsors": sponsor_router,
4031
}
4132

@@ -47,7 +38,7 @@
4738
"docs": Swagger(settings={"persistAuthorization": True}),
4839
"throttle": [AuthRateThrottle("10/s")],
4940
"title": "OWASP Nest",
50-
"version": "0.2.4",
41+
"version": "0.2.5",
5142
}
5243

5344
api_settings_customization = {}
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Generated by Django 5.2.7 on 2025-10-18 01:25
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
dependencies = [
8+
("nest", "0007_alter_badge_css_class"),
9+
]
10+
11+
operations = [
12+
migrations.AlterField(
13+
model_name="badge",
14+
name="css_class",
15+
field=models.CharField(
16+
choices=[
17+
("award", "Award"),
18+
("bug_slash", "Bug Slash"),
19+
("certificate", "Certificate"),
20+
("medal", "Medal"),
21+
("ribbon", "Ribbon"),
22+
("star", "Star"),
23+
],
24+
default="medal",
25+
max_length=255,
26+
verbose_name="CSS Class",
27+
),
28+
),
29+
]

backend/poetry.lock

Lines changed: 497 additions & 488 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/poetry.lock

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/docker/Dockerfile.e2e.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/playwright:v1.56.0-jammy
1+
FROM mcr.microsoft.com/playwright:v1.56.1-jammy
22

33
ENV FORCE_COLOR=1 \
44
NPM_CACHE="/app/.npm" \

frontend/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
"@heroui/theme": "^2.4.23",
3535
"@heroui/toast": "^2.0.17",
3636
"@heroui/tooltip": "^2.2.24",
37-
"@next/eslint-plugin-next": "^15.5.5",
38-
"@next/third-parties": "^15.5.5",
37+
"@next/eslint-plugin-next": "^15.5.6",
38+
"@next/third-parties": "^15.5.6",
3939
"@sentry/nextjs": "^10.20.0",
4040
"@testing-library/user-event": "^14.6.1",
4141
"@types/lodash": "^4.17.20",
@@ -54,7 +54,7 @@
5454
"lodash": "^4.17.21",
5555
"markdown-it": "^14.1.0",
5656
"millify": "^6.1.0",
57-
"next": "^15.5.5",
57+
"next": "^15.5.6",
5858
"next-auth": "^4.24.11",
5959
"next-themes": "^0.4.6",
6060
"react": "^19.2.0",
@@ -69,14 +69,14 @@
6969
"devDependencies": {
7070
"@axe-core/react": "^4.10.2",
7171
"@eslint/eslintrc": "^3.3.1",
72-
"@eslint/js": "^9.37.0",
72+
"@eslint/js": "^9.38.0",
7373
"@graphql-codegen/cli": "^6.0.0",
7474
"@graphql-codegen/near-operation-file-preset": "^3.1.0",
7575
"@graphql-codegen/typed-document-node": "^6.0.2",
7676
"@graphql-codegen/typescript": "^5.0.2",
7777
"@graphql-codegen/typescript-operations": "^5.0.2",
7878
"@lhci/cli": "^0.15.1",
79-
"@playwright/test": "^1.56.0",
79+
"@playwright/test": "^1.56.1",
8080
"@swc/core": "1.13.19",
8181
"@swc/jest": "^0.2.39",
8282
"@tailwindcss/postcss": "^4.1.14",
@@ -86,14 +86,14 @@
8686
"@types/leaflet": "^1.9.21",
8787
"@types/leaflet.markercluster": "^1.5.6",
8888
"@types/markdown-it": "^14.1.2",
89-
"@types/node": "^22.18.10",
89+
"@types/node": "^22.18.11",
9090
"@types/react": "^19.2.2",
9191
"@types/react-dom": "^19.2.2",
9292
"@types/react-gtm-module": "^2.0.4",
9393
"@typescript-eslint/eslint-plugin": "^8.46.1",
9494
"@typescript-eslint/parser": "^8.46.1",
95-
"eslint": "^9.37.0",
96-
"eslint-config-next": "^15.5.5",
95+
"eslint": "^9.38.0",
96+
"eslint-config-next": "^15.5.6",
9797
"eslint-config-prettier": "^10.1.8",
9898
"eslint-import-resolver-alias": "^1.1.2",
9999
"eslint-plugin-jest": "^29.0.1",
@@ -110,7 +110,7 @@
110110
"open": "^10.2.0",
111111
"postcss": "^8.5.6",
112112
"prettier": "^3.6.2",
113-
"prettier-plugin-tailwindcss": "^0.7.0",
113+
"prettier-plugin-tailwindcss": "^0.7.1",
114114
"require-in-the-middle": "^8.0.0",
115115
"tailwindcss": "^4.1.14",
116116
"ts-jest": "^29.4.5",

0 commit comments

Comments
 (0)