github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-19 04:49:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2827 from tidusjar/develop

Browse source 
Develop
This commit is contained in:
Jamie 2019-02-19 16:26:54 +00:00 • committed by GitHub
commit c0040bf951
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Ombi.Notifications.Templates/EmailBasicTemplate.cs
View file

@ -13,7 +13,7 @@ namespace Ombi.Notifications.Templates
if (string.IsNullOrEmpty(_templateLocation)) if (string.IsNullOrEmpty(_templateLocation))
{ {
#if DEBUG #if DEBUG
_templateLocation = Path.Combine(Directory.GetCurrentDirectory(), "bin", "Debug", "netcoreapp2.0", "Templates", _templateLocation = Path.Combine(Directory.GetCurrentDirectory(), "bin", "Debug", "netcoreapp2.2", "Templates",
"BasicTemplate.html"); "BasicTemplate.html");
#else #else
_templateLocation = Path.Combine(Directory.GetCurrentDirectory(), "Templates","BasicTemplate.html"); _templateLocation = Path.Combine(Directory.GetCurrentDirectory(), "Templates","BasicTemplate.html");

5
src/Ombi.Notifications/GenericEmailProvider.cs
View file

@ -57,11 +57,6 @@ namespace Ombi.Notifications
using (var client = new SmtpClient()) using (var client = new SmtpClient())
{ {
if (customization.ApplicationUrl.HasValue())
{
client.LocalDomain = customization.ApplicationUrl;
}
if (settings.DisableCertificateChecking) if (settings.DisableCertificateChecking)
{ {
// Disable validation of the certificate associated with the SMTP service // Disable validation of the certificate associated with the SMTP service