diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-09 08:18:48 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-09 08:18:48 +0000 |
| commit | 7ea12d8067357f8e846e26b05a1dc4ab3d5a5a93 (patch) | |
| tree | fa9910159eb7e73a52be1f5127c4992e2de7da20 /app/models | |
| parent | 8db76243abfd1ebc98553426075f3fb4ddab54fe (diff) | |
| parent | 52c8651a6caf5236ff173555164b676958540b9e (diff) | |
| download | gitlab-ce-7ea12d8067357f8e846e26b05a1dc4ab3d5a5a93.tar.gz | |
Merge branch 'mrchrisw-fix-slack-notify' into 'master'
Fix notify_only_default_branch check for Slack service
See merge request !11154
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project_services/chat_notification_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_services/chat_notification_service.rb b/app/models/project_services/chat_notification_service.rb index fa782c6fbb7..6464bf3f4a4 100644 --- a/app/models/project_services/chat_notification_service.rb +++ b/app/models/project_services/chat_notification_service.rb @@ -150,7 +150,7 @@ class ChatNotificationService < Service def notify_for_ref?(data) return true if data[:object_attributes][:tag] - return true unless notify_only_default_branch + return true unless notify_only_default_branch? data[:object_attributes][:ref] == project.default_branch end |