Skip to content

Commit 57f8c4e

Browse files
authored
Merge branch 'feature/mentorship-portal' into command/filter-sync-issue
2 parents 73780ca + c02929e commit 57f8c4e

162 files changed

Lines changed: 5599 additions & 2926 deletions

File tree

Some content is hidden

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

.github/CODEOWNERS

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,4 @@
33
# For more information on CODEOWNERS, see:
44
# https://help.github.com/en/articles/about-code-owners
55

6-
* @arkid15r
7-
/cspell/ @arkid15r @kasya
8-
/frontend/ @arkid15r @kasya
6+
* @arkid15r @kasya

.github/workflows/run-ci-cd.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,8 @@ jobs:
346346
platforms: linux/amd64
347347
push: true
348348
secrets: |
349-
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
349+
RELEASE_VERSION=${{ needs.set-release-version.outputs.release_version }}
350+
SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
350351
tags: owasp/nest:frontend-staging
351352

352353
- name: Get frontend image size
@@ -665,7 +666,8 @@ jobs:
665666
platforms: linux/amd64
666667
push: true
667668
secrets: |
668-
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
669+
RELEASE_VERSION=${{ needs.set-release-version.outputs.release_version }}
670+
SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
669671
tags: owasp/nest:frontend-production
670672

671673
- name: Get frontend image size

.github/workflows/run-code-ql.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ on:
44
merge_group:
55
pull_request:
66
branches:
7+
- feature/*
78
- main
89
push:
910
branches:
11+
- feature/*
1012
- main
1113
workflow_dispatch:
1214

@@ -29,7 +31,7 @@ jobs:
2931
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
3032

3133
- name: Initialize CodeQL
32-
uses: github/codeql-action/init@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d
34+
uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3
3335
with:
3436
languages: ${{ matrix.language }}
3537

@@ -53,6 +55,6 @@ jobs:
5355
run: pnpm install --frozen-lockfile
5456

5557
- name: Perform CodeQL analysis
56-
uses: github/codeql-action/analyze@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d
58+
uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3
5759
with:
5860
category: /language:${{ matrix.language }}

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
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.12.12
13+
rev: v0.13.0
1414
hooks:
1515
- id: ruff
1616
args:
@@ -38,7 +38,7 @@ repos:
3838
exclude: (.github|pnpm-lock.yaml)
3939

4040
- repo: https://github.com/pre-commit/mirrors-mypy
41-
rev: v1.17.1
41+
rev: v1.18.1
4242
hooks:
4343
- id: mypy
4444
additional_dependencies:

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ make check
400400

401401
This command runs linters and other static analysis tools for both the frontend and backend.
402402

403-
We utilize third-party tools such as CodeRabbit and SonarQube for code review, static analysis, and quality checks. As a contributor, it's your responsibility to address or mark as resolved all issues and suggestions reported by these tools during your pull request review. If a suggestion is valid, please implement it; if not, you may mark it as resolved with a brief explanation. If you're uncertain about a particular suggestion, feel free to leave a comment optionally tagging project leaders or mentors you're working with for further guidance.
403+
We utilize third-party tools such as CodeRabbit, GitHub Advanced Security, and SonarQube for code review, static analysis, and quality checks. As a contributor, it's your responsibility to address (mark as resolved) all issues and suggestions reported by these tools during your pull request review. If a suggestion is valid, please implement it; if not, you may mark it as resolved with a brief explanation. If you're uncertain about a particular suggestion, feel free to leave a comment optionally tagging project maintainer(s) you're working with for further guidance.
404404
405405
**Please note that your pull request will not be reviewed until all code quality checks pass and all automated suggestions have been addressed or resolved.**
406406

backend/apps/api/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"""OWASP API."""

backend/apps/api/admin/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from .api_key import ApiKeyAdmin
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
"""Nest app APIKey model admin."""
1+
"""API key model admin."""
22

33
from django.contrib import admin
44

5-
from apps.nest.models.api_key import ApiKey
5+
from apps.api.models.api_key import ApiKey
66

77

88
class ApiKeyAdmin(admin.ModelAdmin):

backend/apps/api/apps.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
"""API app config."""
2+
3+
from django.apps import AppConfig
4+
5+
6+
class ApiConfig(AppConfig):
7+
"""API app config."""
8+
9+
name = "apps.api"
File renamed without changes.

0 commit comments

Comments
 (0)