summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-04-18 16:00:10 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-04-18 16:00:10 +0000
commitf97b636f3868199ee06d4b9370d77260d389800d (patch)
tree61336ba0926f492429e59598e1762938da0fb44d /app
parente6d87a9733324423f9453ec9a161113977ed1b8e (diff)
parent7696191e330337ab5fac207bf24aa13d211a0ded (diff)
downloadgitlab-ce-f97b636f3868199ee06d4b9370d77260d389800d.tar.gz
Merge branch '31009-disable-test-settings-on-services-when-repository-is-empty' into 'master'
Disables test settings on chat notification services when repository is empty Closes #31009 See merge request !10759
Diffstat (limited to 'app')
-rw-r--r--app/models/project_services/chat_notification_service.rb2
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..f2dfb87dbda 100644
--- a/app/models/project_services/chat_notification_service.rb
+++ b/app/models/project_services/chat_notification_service.rb
@@ -22,7 +22,7 @@ class ChatNotificationService < Service
end
def can_test?
- valid?
+ super && valid?
end
def self.supported_events