diff options
author | Rémy Coutable <remy@rymai.me> | 2018-05-16 21:39:29 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-05-16 21:39:29 +0300 |
commit | 8d024ba79a2e2a2f2d34f4ee678b496f0fbe64f9 (patch) | |
tree | e26b5fd39c31ad170e0059aa3106bfbb1d7f5aac /app/controllers/projects/settings | |
parent | 6d81905fafb23f20520eb5ffa46c94b18ccc8686 (diff) |
Backport changes from EE to minimize the CE/EE diff in Projects::Settings::IntegrationsController
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/controllers/projects/settings')
-rw-r--r-- | app/controllers/projects/settings/integrations_controller.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/controllers/projects/settings/integrations_controller.rb b/app/controllers/projects/settings/integrations_controller.rb index 1ff08cce8cb..d9fecfecc40 100644 --- a/app/controllers/projects/settings/integrations_controller.rb +++ b/app/controllers/projects/settings/integrations_controller.rb @@ -11,7 +11,14 @@ module Projects @hook = ProjectHook.new # Services - @services = @project.find_or_initialize_services + @services = @project.find_or_initialize_services(exceptions: service_exceptions) + end + + private + + # Returns a list of services that should be hidden from the list + def service_exceptions + @project.disabled_services.dup end end end |