Skip to content

Commit

Permalink
Merge branch 'main' into importing-bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
northdpole authored Jan 8, 2024
2 parents a9d8507 + 270df2a commit aea6318
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Test-e2e
on: [push]
on: [push, pull_request]
jobs:
build:
name: Test-e2e
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
---
name: Lint Code Base

on:
push:
branches-ignore: [master, main]
# Main branch should be protected
pull_request:
branches: [master, main]
on: [push, pull_request]
jobs:
build:
name: Lint Code Base
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Test
on: [push]
on: [push, pull_request]
jobs:
build:
name: Test
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Unsure where to begin contributing? You can start by looking through these `begi

### Pull Requests


Each Pull Request should close a single ticket and only make changes necessary in order for this to be done. Please reference the relevant ticket in the Pull Request.
After you submit your pull request, verify that all [status checks](https://help.github.com/articles/about-status-checks/) are passing <details><summary>What if the status checks are failing?</summary>If a status check is failing, and you believe that the failure is unrelated to your change, please leave a comment on the pull request explaining why you believe the failure is unrelated. A maintainer will re-run the status check for you. If we conclude that the failure was a false positive, then we will open an issue to track that problem with our status check suite.</details>

## Styleguides
Expand Down
2 changes: 1 addition & 1 deletion application/utils/external_project_parsers/juiceshop.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def parse(
name="OWASP Juice Shop",
section=challenge["name"],
sectionID=challenge["key"],
hyperlink="https://demo.owasp-juice.shop//#/score-board?challenge="
hyperlink="https://demo.owasp-juice.shop//#/score-board?searchQuery="
+ urllib.parse.quote(challenge["name"]),
tooltype=defs.ToolTypes.Training,
tags=[challenge["category"]],
Expand Down

0 comments on commit aea6318

Please sign in to comment.