diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-17 06:09:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-17 06:09:14 +0300 |
| commit | 4bc0e064023a13d90da5acc4fd152fca66926ea2 (patch) | |
| tree | bebd92d2f5392f8c1bd785fbe14b3b3bf03fc5d1 /app/helpers/services_helper.rb | |
| parent | d5cf5cf4f77eec07a04604b1a0298452029df16f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/services_helper.rb')
| -rw-r--r-- | app/helpers/services_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/services_helper.rb b/app/helpers/services_helper.rb index cf9d04735ce..1f9cce80bed 100644 --- a/app/helpers/services_helper.rb +++ b/app/helpers/services_helper.rb @@ -101,6 +101,7 @@ module ServicesHelper def integration_form_data(integration) { + id: integration.id, show_active: integration.show_active_box?.to_s, activated: (integration.active || integration.new_record?).to_s, type: integration.to_param, @@ -109,7 +110,8 @@ module ServicesHelper enable_comments: integration.comment_on_event_enabled.to_s, comment_detail: integration.comment_detail, trigger_events: trigger_events_for_service(integration), - fields: fields_for_service(integration) + fields: fields_for_service(integration), + inherit_from_id: integration.inherit_from_id } end |