Skip to content
This repository has been archived by the owner on Dec 16, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' into 129-pin-inboxes
Browse files Browse the repository at this point in the history
touch #129
  • Loading branch information
moggers87 committed Mar 31, 2016
2 parents 9eab535 67a3060 commit 1ae6a06
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions inboxen/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 229,7 @@
if DEBUG:
# local dev made easy
INSTALLED_APPS = ('debug_toolbar',)
JQUERY_URL = None
CSP_REPORT_ONLY = True

# csrf
Expand Down
2 changes: 1 addition & 1 deletion inboxen/utils/email.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 81,7 @@ def _clean_html_body(request, email, body, charset):
except Exception as exc:
# Yeah, a pretty wide catch, but Premailer likes to throw up everything and anything
messages.info(request, _("Part of this message could not be parsed - it may not display correctly"))
_log.exception(exc)
_log.exception(exc, extra={"request": request})

# Mail Pile uses this, give back if you come up with something better
cleaner = Cleaner(
Expand Down

0 comments on commit 1ae6a06

Please sign in to comment.