Merge remote-tracking branch 'downstream/release_3.3.0' into devel

# Conflicts:
#	awx/main/notifications/slack_backend.py
This commit is contained in:
Shane McDonald
2018-09-18 08:11:50 -04:00
246 changed files with 10831 additions and 6593 deletions

View File

@@ -37,6 +37,7 @@ class SlackBackend(AWXBaseEmailBackend):
if self.color:
ret = connection.api_call("chat.postMessage",
channel=r,
as_user=True,
attachments=[{
"color": self.color,
"text": m.subject