github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-13 00:32:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

mmerge

Browse source
This commit is contained in:
tidusjar 2019-03-27 10:41:52 +00:00
commit bc697a03e9
3 changed files with 2 additions and 11723 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Ombi.Core/Authentication/OmbiUserManager.cs
View file

@ -158,7 +158,7 @@ namespace Ombi.Core.Authentication
if (!email.Equals(result.User?.Email)) if (!email.Equals(result.User?.Email))
{ {
user.Email = result.User?.Email; user.Email = result.User?.Email;
await UpdateAsync(user); await GlobalMutex.Lock(async () => await UpdateAsync(user));
} }
return true; return true;

2
src/Ombi/ClientApp/src/app/shared/functions/common-functions.ts
View file

@ -1,6 +1,6 @@
export function getBaseLocation() { export function getBaseLocation() {
debugger; debugger;
let paths: string[] = location.pathname.split('/').splice(1, 1); let paths: string[] = location.pathname.split('/').splice(1, 1);
let basePath: string = (paths && paths[0]) || 'discover'; // Default: discover let basePath: string = (paths && paths[0] ? paths[0] : "");
return '/' + basePath; return '/' + basePath;
} }

11721
src/Ombi/package-lock.json generated
View file

File diff suppressed because it is too large Load diff