diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 21:09:16 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 21:09:16 +0300 |
| commit | 80e9fdc9682cfbcfb9202a2733605a6a6bd23f05 (patch) | |
| tree | 168375ea13d1a1f01d4cbcf6f0513fc9883e9477 /app/controllers/groups | |
| parent | 5372e109c0660e4670aa987568a51082beca1b3c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/groups')
| -rw-r--r-- | app/controllers/groups/settings/integrations_controller.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/groups/settings/integrations_controller.rb b/app/controllers/groups/settings/integrations_controller.rb index 0ba030f26bc..adfbe9bfa17 100644 --- a/app/controllers/groups/settings/integrations_controller.rb +++ b/app/controllers/groups/settings/integrations_controller.rb @@ -7,6 +7,10 @@ module Groups before_action :authorize_admin_group! + def index + @integrations = [] + end + private # TODO: Make this compatible with group-level integration |