diff options
Diffstat (limited to 'app/views/shared/_service_settings.html.haml')
| -rw-r--r-- | app/views/shared/_service_settings.html.haml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/shared/_service_settings.html.haml b/app/views/shared/_service_settings.html.haml index a9203459914..92b86c6fec1 100644 --- a/app/views/shared/_service_settings.html.haml +++ b/app/views/shared/_service_settings.html.haml @@ -1,5 +1,4 @@ = form_errors(@service) -- trigger_events = Feature.enabled?(:integration_form_refactor) ? ServiceEventSerializer.new(service: @service).represent(@service.configurable_events).to_json : [] - if lookup_context.template_exists?('help', "projects/services/#{@service.to_param}", true) = render "projects/services/#{@service.to_param}/help", subject: @service @@ -10,9 +9,9 @@ .service-settings .js-vue-integration-settings{ data: { show_active: @service.show_active_box?.to_s, activated: (@service.active || @service.new_record?).to_s, type: @service.to_param, merge_request_events: @service.merge_requests_events.to_s, -commit_events: @service.commit_events.to_s, enable_comments: @service.comment_on_event_enabled.to_s, comment_detail: @service.comment_detail, trigger_events: trigger_events } } +commit_events: @service.commit_events.to_s, enable_comments: @service.comment_on_event_enabled.to_s, comment_detail: @service.comment_detail, trigger_events: trigger_events_for_service, fields: fields_for_service } } - - if @service.configurable_events.present? && !@service.is_a?(JiraService) && Feature.disabled?(:integration_form_refactor) + - if show_service_trigger_events? .form-group.row %label.col-form-label.col-sm-2= _('Trigger') @@ -33,5 +32,6 @@ commit_events: @service.commit_events.to_s, enable_comments: @service.comment_on %p.text-muted = @service.class.event_description(event) - - @service.global_fields.each do |field| - = render 'shared/field', form: form, field: field + - unless integration_form_refactor? + - @service.global_fields.each do |field| + = render 'shared/field', form: form, field: field |