diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-23 21:08:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-23 21:08:31 +0300 |
| commit | 7e1e5ca371cbfe77bdf56fcf65a4e749e6e86a06 (patch) | |
| tree | c40953fc74404b5d86bb2ef72bab89526c5ca7d6 /app/services/bulk_create_integration_service.rb | |
| parent | 9086e66ee72527839053ec6db19ed321a3b3a61b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/bulk_create_integration_service.rb')
| -rw-r--r-- | app/services/bulk_create_integration_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/bulk_create_integration_service.rb b/app/services/bulk_create_integration_service.rb index 2cec7e71989..96bf8a6abaf 100644 --- a/app/services/bulk_create_integration_service.rb +++ b/app/services/bulk_create_integration_service.rb @@ -47,7 +47,7 @@ class BulkCreateIntegrationService if integration.template? integration.to_service_hash else - integration.to_service_hash.tap { |json| json['inherit_from_id'] = integration.id } + integration.to_service_hash.tap { |json| json['inherit_from_id'] = integration.inherit_from_id || integration.id } end end |