diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 341a0559b..d91b6d6c3 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -1,5 +1,5 @@ name: Test-e2e -on: [push] +on: [push, pull_request] jobs: build: name: Test-e2e diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index ad465b5a6..b32236167 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -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 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 531b9b35b..5c4d0e76e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,5 @@ name: Test -on: [push] +on: [push, pull_request] jobs: build: name: Test diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0efe31f9c..fb14e9484 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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
What if the status checks are failing?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.
## Styleguides diff --git a/application/utils/external_project_parsers/juiceshop.py b/application/utils/external_project_parsers/juiceshop.py index 632a4f45c..f32ca9ab9 100644 --- a/application/utils/external_project_parsers/juiceshop.py +++ b/application/utils/external_project_parsers/juiceshop.py @@ -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"]],