Skip to content

Commit ac6f12e

Browse files
authored
Merge branch 'main' into pnpm-9.15.4
2 parents de8df70 + ed49499 commit ac6f12e

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

.github/workflows/cve_checks.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
name: "Infra: CVE checks"
22
on:
3+
pull_request:
4+
types: [ "opened", "reopened", "synchronize" ]
5+
push:
6+
branches: [ "main" ]
37
workflow_dispatch:
48
schedule:
59
# * is a special character in YAML so you have to quote this string
@@ -71,7 +75,7 @@ jobs:
7175

7276
notify:
7377
needs: check-cves
74-
if: ${{ always() && needs.build-and-test.result == 'failure' }}
78+
if: ${{ always() && needs.build-and-test.result == 'failure' && github.event_name == 'schedule' }}
7579
uses: ./.github/workflows/infra_discord_hook.yml
7680
with:
7781
message: "Attention! CVE checks run failed! Please fix them CVEs :("

api/src/main/java/io/kafbat/ui/config/auth/LdapSecurityConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public AbstractLdapAuthenticationProvider authenticationProvider(LdapAuthorities
8080
}
8181

8282
@Bean
83-
@ConditionalOnProperty(value = "oauth2.ldap.activeDirectory", havingValue = "false")
83+
@ConditionalOnProperty(value = "oauth2.ldap.activeDirectory", havingValue = "false", matchIfMissing = true)
8484
public BindAuthenticator ldapBindAuthentication(LdapContextSource ldapContextSource) {
8585
BindAuthenticator ba = new BindAuthenticator(ldapContextSource);
8686

frontend/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@
103103
"whatwg-fetch": "3.6.20"
104104
},
105105
"engines": {
106-
"node": "^22.12.0",
107-
"pnpm": "^9.15.4"
106+
"node": "^22",
107+
"pnpm": "^9"
108108
},
109109
"pnpm": {
110110
"overrides": {

0 commit comments

Comments
 (0)