forked from juice-shop/juice-shop
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into database-locked
- Loading branch information
Showing
232 changed files
with
3,054 additions
and
1,757 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| /vagrant/ @wurstbrot | ||
| /vagrant/ @wurstbrot | ||
| /.github/workflows/lint-fixer.yml @J12934 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| name: "Let me lint:fix that for you" | ||
|
|
||
| on: [push] | ||
|
|
||
| jobs: | ||
| LMLFTFY: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Check out Git repository | ||
| uses: actions/checkout@v2 | ||
| - name: 'Install Linter' | ||
| run: | | ||
| npm install --ignore-scripts | ||
| cd frontend | ||
| npm install --ignore-scripts | ||
| - name: 'Fix everything which can be fixed' | ||
| run: 'npm run lint:fix' | ||
| - uses: stefanzweifel/[email protected] | ||
| with: | ||
| commit_message: "Auto-fix linting issues" | ||
|
|
||
| # Optional name of the branch the commit should be pushed to | ||
| # Required if Action is used in Workflow listening to the `pull_request` event | ||
| branch: ${{ github.head_ref }} | ||
|
|
||
| # Optional git params | ||
| commit_options: '--signoff' | ||
|
|
||
| # Optional commit user and author settings | ||
| commit_user_name: JuiceShopBot | ||
| commit_user_email: [email protected] | ||
| commit_author: JuiceShopBot <[email protected]> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| name: Automatic Rebase | ||
|
|
||
| on: | ||
| issue_comment: | ||
| types: [created] | ||
|
|
||
| jobs: | ||
| rebase: | ||
| name: Rebase | ||
| if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@master | ||
| with: | ||
| fetch-depth: 0 | ||
| - name: Automatic Rebase | ||
| uses: cirrus-actions/[email protected] | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| # https://github.community/t5/GitHub-Actions/Workflow-is-failing-if-no-job-can-be-ran-due-to-condition/m-p/38186#M3250 | ||
| always_job: | ||
| name: Always run job | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Always run | ||
| run: echo "This job is used to prevent the workflow to fail when all other jobs are skipped." |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,7 @@ LABEL maintainer="Bjoern Kimminich <[email protected]>" \ | |
| org.opencontainers.image.vendor="Open Web Application Security Project" \ | ||
| org.opencontainers.image.documentation="https://help.owasp-juice.shop" \ | ||
| org.opencontainers.image.licenses="MIT" \ | ||
| org.opencontainers.image.version="10.0.0-SNAPSHOT" \ | ||
| org.opencontainers.image.version="10.1.0-SNAPSHOT" \ | ||
| org.opencontainers.image.url="https://owasp-juice.shop" \ | ||
| org.opencontainers.image.source="https://github.com/bkimminich/juice-shop" \ | ||
| org.opencontainers.image.revision=$VCS_REF \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.