diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-04 03:09:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-04 03:09:37 +0300 |
| commit | e3bdfa1a13d7e6c92716324c78b5b20c07eeb7c6 (patch) | |
| tree | e8776263096b027d32d4be5118cccc87b00de2bc /app/controllers/groups | |
| parent | c1a50b8195f4e36fda9b233acbde57a449bcf6c3 (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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/groups/settings/integrations_controller.rb b/app/controllers/groups/settings/integrations_controller.rb index 43f8a7118d4..0ba030f26bc 100644 --- a/app/controllers/groups/settings/integrations_controller.rb +++ b/app/controllers/groups/settings/integrations_controller.rb @@ -9,6 +9,12 @@ module Groups private + # TODO: Make this compatible with group-level integration + # https://gitlab.com/groups/gitlab-org/-/epics/2543 + def find_or_initialize_integration(name) + Project.first.find_or_initialize_service(name) + end + def integrations_enabled? Feature.enabled?(:group_level_integrations, group) end |