Skip to content

Commit ade52aa

Browse files
committed
Merge branch 'main' of github.com:db-ui/base into dbux-3
� Conflicts: � .gitignore
2 parents 65e6fb0 + fe5667d commit ade52aa

File tree

5 files changed

+88
-80
lines changed

5 files changed

+88
-80
lines changed

.github/actions/extract-branch/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ runs:
1616
script: |
1717
return (
1818
context?.payload?.pull_request?.head?.ref ||
19-
context?.payload?.ref
19+
context?.payload?.ref || ""
2020
).replace("refs/heads/","");
2121
- name: 🪑 Set output
2222
id: branch-name

.github/workflows/00-scan-secrets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
id: extract_branch
1818

1919
- name: 🐷 TruffleHog OSS
20-
uses: trufflesecurity/[email protected].0
20+
uses: trufflesecurity/[email protected].1
2121
with:
2222
path: ./
2323
base: ${{ steps.extract_branch.outputs.branch-name }}

.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,11 @@ source/_meta/_foot.mustache
1313

1414
tailwind.config.js
1515
/.env
16+
17+
# vim files
18+
*.swp
19+
*.swo
20+
tags
21+
ctags.tmp
22+
[._]*.un~
23+

package-lock.json

Lines changed: 76 additions & 76 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
},
3838
"license": "Apache-2.0",
3939
"devDependencies": {
40-
"@commitlint/cli": "17.1.2",
41-
"@commitlint/config-conventional": "17.1.0",
40+
"@commitlint/cli": "17.2.0",
41+
"@commitlint/config-conventional": "17.2.0",
4242
"@mfranzke/plugin-node-uiextension": "^1.0.0",
4343
"@pattern-lab/cli": "5.17.0",
4444
"@pattern-lab/core": "5.17.0",

0 commit comments

Comments
 (0)