diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-01 03:08:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-01 03:08:09 +0300 |
commit | 396ad86100541bed6bc9960541a7dcddfaddd6de (patch) | |
tree | 65f131996352948dbeb09d7ccd56107561c08fe3 /app/controllers/projects | |
parent | abae8f34f377519946a91101ef7abf504454531c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects')
-rw-r--r-- | app/controllers/projects/settings/integrations_controller.rb | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/app/controllers/projects/settings/integrations_controller.rb b/app/controllers/projects/settings/integrations_controller.rb index a4a53676ec7..96bf7f474d1 100644 --- a/app/controllers/projects/settings/integrations_controller.rb +++ b/app/controllers/projects/settings/integrations_controller.rb @@ -3,23 +3,12 @@ module Projects module Settings class IntegrationsController < Projects::ApplicationController - include ServiceParams - before_action :authorize_admin_project! layout "project_settings" def show - @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 + @services = @project.find_or_initialize_services end end end end - -Projects::Settings::IntegrationsController.prepend_if_ee('EE::Projects::Settings::IntegrationsController') |