Accommodate new webhook url format.

1 files changed, 7 insertions, 5 deletions

diff --git a/app/models/project_services/slack_service.rb b/app/models/project_services/slack_service.rb
index 2174919346d..dfa1e9c9820 100644
--- a/app/models/project_services/slack_service.rb
+++ b/app/models/project_services/slack_service.rb
@@ -40,11 +40,13 @@ class SlackService < Service
       project_name: project_name
     ))
 
-    credentials = webhook.match(/(\w*).slack.com.*token=(\w*)/)
-    subdomain =  credentials[1]
-    token = credentials[2]
-    notifier = Slack::Notifier.new(subdomain, token)
-    notifier.ping(message.pretext, attachments: message.attachments)
+    credentials = webhook.match(/(\w*).slack.com.*services\/(.*)/)
+    if credentials.present?
+      subdomain =  credentials[1]
+      token = credentials[2].split("token=").last
+      notifier = Slack::Notifier.new(subdomain, token)
+      notifier.ping(message.pretext, attachments: message.attachments)
+    end
   end
 
   private