Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into feature/projects-…
Browse files Browse the repository at this point in the history
…also-used-in
  • Loading branch information
setchy committed May 7, 2024
2 parents 8d6bd4b + 2859c98 commit c4c3990
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/_meta-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/[email protected].4
uses: actions/[email protected].5

- name: Set up NodeJs
uses: actions/[email protected]
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/[email protected].4
uses: actions/[email protected].5

- name: Download Artifacts
uses: actions/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
fi
- name: Checkout Repository
uses: actions/[email protected].4
uses: actions/[email protected].5

- name: Parse Version from package.json
id: parse
Expand All @@ -47,7 +47,7 @@ jobs:
- call-build
steps:
- name: Checkout Repository
uses: actions/[email protected].4
uses: actions/[email protected].5

- name: Download Artifacts
uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/[email protected].4
uses: actions/[email protected].5

- name: Set up NodeJs
uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/[email protected].4
uses: actions/[email protected].5

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/[email protected].4
uses: actions/[email protected].5

- name: Dependency Review
uses: actions/dependency-review-action@v4
2 changes: 1 addition & 1 deletion .github/workflows/i18n.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/[email protected].4
uses: actions/[email protected].5

- name: Set up NodeJs
uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/[email protected].4
uses: actions/[email protected].5

- name: Set up NodeJs
uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nginxinc/nginx-unprivileged:1.25.5-alpine@sha256:07b9c906db3a135d0f0c4dba3269a889bac231cedbb3bab3e997451c0b41ee12
FROM nginxinc/nginx-unprivileged:1.25.5-alpine@sha256:0480c2bab1b1c46fdedb0fdc77f6c5991f28a54ae46100f3ac7da21ef31d61c7

# Arguments that can be passed at build time
ARG COMMIT_SHA=unknown
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dependencytrack/frontend",
"version": "4.10.0",
"version": "4.11.0",
"description": "Single Page Application for OWASP Dependency-Track",
"author": "Steve Springett",
"homepage": "https://dependencytrack.org/",
Expand Down

0 comments on commit c4c3990

Please sign in to comment.