diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-05-17 18:49:07 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-05-17 18:49:07 +0300 |
| commit | 47555ef85e2a138e5ac16bfff597b7e72f818b25 (patch) | |
| tree | 34fb454bba60b7537adaa2a0993b6b2835a2959e /app/models/project.rb | |
| parent | 4583e67c436046257210082f2b41700d8568e4dc (diff) | |
| parent | 8d024ba79a2e2a2f2d34f4ee678b496f0fbe64f9 (diff) | |
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/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 0975e64e995..35c873830a7 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -997,7 +997,7 @@ class Project < ActiveRecord::Base available_services_names = Service.available_services_names - exceptions - available_services_names.map do |service_name| + available_services = available_services_names.map do |service_name| service = find_service(services, service_name) if service @@ -1014,6 +1014,14 @@ class Project < ActiveRecord::Base end end end + + available_services.reject do |service| + disabled_services.include?(service.to_param) + end + end + + def disabled_services + [] end def find_or_initialize_service(name) |