diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2014-10-21 11:38:41 +0200 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2014-10-21 14:35:04 +0300 |
| commit | 9f54397f3a3e094665d25109a63f24757a19df3a (patch) | |
| tree | 0255bc187daac0081a3d8dd7493078c0cc0a69f7 | |
| parent | b1e60cfa1b56d01c2328ebe2a3d49cd82058f981 (diff) | |
| download | gitlab-ce-9f54397f3a3e094665d25109a63f24757a19df3a.tar.gz | |
Use allowed slack team name.
| -rw-r--r-- | app/models/project_services/slack_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/project_services/slack_service.rb b/app/models/project_services/slack_service.rb index 95f3ddcef45..837002ef3c8 100644 --- a/app/models/project_services/slack_service.rb +++ b/app/models/project_services/slack_service.rb @@ -40,7 +40,8 @@ class SlackService < Service project_name: project_name )) - credentials = webhook.match(/(\w*).slack.com.*services\/(.*)/) + credentials = webhook.match(/([\w-]*).slack.com.*services\/(.*)/) + if credentials.present? subdomain = credentials[1] token = credentials[2].split("token=").last |