diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-05-17 15:49:07 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-05-17 15:49:07 +0000 |
| commit | 47555ef85e2a138e5ac16bfff597b7e72f818b25 (patch) | |
| tree | 34fb454bba60b7537adaa2a0993b6b2835a2959e /app/controllers/projects/settings | |
| parent | 4583e67c436046257210082f2b41700d8568e4dc (diff) | |
| parent | 8d024ba79a2e2a2f2d34f4ee678b496f0fbe64f9 (diff) | |
| download | gitlab-ce-47555ef85e2a138e5ac16bfff597b7e72f818b25.tar.gz | |
Merge branch '6020-extract-ee-specific-controller-lines' into 'master'
[CE] Resolve "Extract EE specific files/lines for some controllers"
See merge request gitlab-org/gitlab-ce!18994
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 |