Skip to content

Commit

Permalink
Merge branch 'main' of github.com:db-ui/base into dbux-3
Browse files Browse the repository at this point in the history
� Conflicts:
�	.gitignore
  • Loading branch information
nmerget committed Nov 1, 2022
2 parents 65e6fb0 + fe5667d commit ade52aa
Show file tree
Hide file tree
Showing 5 changed files with 88 additions and 80 deletions.
2 changes: 1 addition & 1 deletion .github/actions/extract-branch/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ runs:
script: |
return (
context?.payload?.pull_request?.head?.ref ||
context?.payload?.ref
context?.payload?.ref || ""
).replace("refs/heads/","");
- name: 🪑 Set output
id: branch-name
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/00-scan-secrets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
id: extract_branch

- name: 🐷 TruffleHog OSS
uses: trufflesecurity/[email protected].0
uses: trufflesecurity/[email protected].1
with:
path: ./
base: ${{ steps.extract_branch.outputs.branch-name }}
Expand Down
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,11 @@ source/_meta/_foot.mustache

tailwind.config.js
/.env

# vim files
*.swp
*.swo
tags
ctags.tmp
[._]*.un~

152 changes: 76 additions & 76 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@commitlint/cli": "17.1.2",
"@commitlint/config-conventional": "17.1.0",
"@commitlint/cli": "17.2.0",
"@commitlint/config-conventional": "17.2.0",
"@mfranzke/plugin-node-uiextension": "^1.0.0",
"@pattern-lab/cli": "5.17.0",
"@pattern-lab/core": "5.17.0",
Expand Down

0 comments on commit ade52aa

Please sign in to comment.