vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of bitbucket.org:yackob03/quay

Browse source
This commit is contained in:
Jake Moshenko 2014-10-14 13:58:14 -04:00
commit 44637dad96
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.py
View file

@ -55,7 +55,7 @@ class DefaultConfig(object):
MAIL_PORT = 587 MAIL_PORT = 587
MAIL_USERNAME = '' MAIL_USERNAME = ''
MAIL_PASSWORD = '' MAIL_PASSWORD = ''
DEFAULT_MAIL_SENDER = '' MAIL_DEFAULT_SENDER = 'support@quay.io'
MAIL_FAIL_SILENTLY = False MAIL_FAIL_SILENTLY = False
TESTING = True TESTING = True

6
endpoints/notificationmethod.py
View file

@ -211,7 +211,7 @@ class FlowdockMethod(NotificationMethod):
if not token: if not token:
return return
owner = model.get_user(notification.repository.namespace_user.username) owner = model.get_user_or_org(notification.repository.namespace_user.username)
if not owner: if not owner:
# Something went wrong. # Something went wrong.
return return
@ -267,7 +267,7 @@ class HipchatMethod(NotificationMethod):
if not token or not room_id: if not token or not room_id:
return return
owner = model.get_user(notification.repository.namespace_user.username) owner = model.get_user_or_org(notification.repository.namespace_user.username)
if not owner: if not owner:
# Something went wrong. # Something went wrong.
return return
@ -334,7 +334,7 @@ class SlackMethod(NotificationMethod):
if not token or not subdomain: if not token or not subdomain:
return return
owner = model.get_user(notification.repository.namespace_user.username) owner = model.get_user_or_org(notification.repository.namespace_user.username)
if not owner: if not owner:
# Something went wrong. # Something went wrong.
return return

8
util/useremails.py
View file

@ -75,7 +75,7 @@ def send_email(recipient, subject, template_file, parameters):
rendered_html = template_env.get_template(template_file + '.html').render(parameters) rendered_html = template_env.get_template(template_file + '.html').render(parameters)
msg = Message('[%s] %s' % (app_title, subject), sender='support@quay.io', recipients=[recipient]) msg = Message('[%s] %s' % (app_title, subject), recipients=[recipient])
msg.html = rendered_html msg.html = rendered_html
mail.send(msg) mail.send(msg)
@ -135,9 +135,7 @@ def send_org_invite_email(member_name, member_email, orgname, team, adder, code)
def send_invoice_email(email, contents): def send_invoice_email(email, contents):
# Note: This completely generates the contents of the email, so we don't use the # Note: This completely generates the contents of the email, so we don't use the
# normal template here. # normal template here.
msg = Message('Quay.io payment received - Thank you!', msg = Message('Quay.io payment received - Thank you!', recipients=[email])
sender='support@quay.io',
recipients=[email])
msg.html = contents msg.html = contents
mail.send(msg) mail.send(msg)
@ -154,7 +152,7 @@ def send_subscription_change(change_description, customer_id, customer_email, qu
""" """
title = SUBSCRIPTION_CHANGE_TITLE.format(quay_username, change_description) title = SUBSCRIPTION_CHANGE_TITLE.format(quay_username, change_description)
msg = Message(title, sender='support@quay.io', recipients=['stripe@quay.io']) msg = Message(title, recipients=['stripe@quay.io'])
msg.html = SUBSCRIPTION_CHANGE.format(change_description, customer_id, customer_email, msg.html = SUBSCRIPTION_CHANGE.format(change_description, customer_id, customer_email,
quay_username) quay_username)
mail.send(msg) mail.send(msg)