watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-08 22:57:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/dev' into dev
Some checks failed
Node.js CI / build (postgresql, 18.18, 10) (push) Has been cancelled
Details

Browse source
This commit is contained in:
Mike Cao 2025-11-22 22:43:39 -08:00
commit 0ddec97bf0
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
prisma/schema.prisma
View file

@ -6,6 +6,7 @@ generator client {
datasource db { datasource db {
provider = "postgresql" provider = "postgresql"
relationMode = "prisma"
} }
model User { model User {

6
src/lib/__tests__/detect.test.ts
View file

@ -17,12 +17,6 @@ test('getIpAddress: Standard header', () => {
expect(getIpAddress(new Headers({ 'x-forwarded-for': IP }))).toEqual(IP); expect(getIpAddress(new Headers({ 'x-forwarded-for': IP }))).toEqual(IP);
}); });
test('getIpAddress: CloudFlare header is lower priority than standard header', () => {
expect(getIpAddress(new Headers({ 'cf-connecting-ip': BAD_IP, 'x-forwarded-for': IP }))).toEqual(
IP,
);
});
test('getIpAddress: No header', () => { test('getIpAddress: No header', () => {
expect(getIpAddress(new Headers())).toEqual(null); expect(getIpAddress(new Headers())).toEqual(null);
}); });