diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-04-27 19:16:31 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-04-27 19:16:31 +0000 |
| commit | 5976195fef53fe1bc56647dfc06049a8f984d5fe (patch) | |
| tree | 06b169be546df8c91ef8709add735b937dce0497 /app/models | |
| parent | 419f39e34d7ca741b33e4dbc2b864c21e60bb164 (diff) | |
| parent | 6368072fd7bbee0f79de358aa8645f463d768bef (diff) | |
| download | gitlab-ce-5976195fef53fe1bc56647dfc06049a8f984d5fe.tar.gz | |
Merge branch '31138-improve-test-settings-for-services-in-empty-projects' into 'master'
improves test settings for chat notification services for empty projects
Closes #31138
See merge request !10886
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project_services/chat_notification_service.rb | 2 | ||||
| -rw-r--r-- | app/models/service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project_services/chat_notification_service.rb b/app/models/project_services/chat_notification_service.rb index f2dfb87dbda..fa782c6fbb7 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? - super && valid? + valid? end def self.supported_events diff --git a/app/models/service.rb b/app/models/service.rb index cbb75186206..c71a7d169ec 100644 --- a/app/models/service.rb +++ b/app/models/service.rb @@ -132,7 +132,7 @@ class Service < ActiveRecord::Base end def can_test? - !project.empty_repo? + true end # reason why service cannot be tested |