diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-08 03:39:27 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-03-08 03:39:27 +0300 |
| commit | 7734e85bc6592c5ad3330c611c5f83a051b680b0 (patch) | |
| tree | 10af9444dee64a8720ac4674e5e215ebcc5d7beb /app/views | |
| parent | f8e06b50eea2aecaf1f37fb7228292e8516e2613 (diff) | |
| parent | 93af1af67fc6af2805f3342aed1fc15a4360870d (diff) | |
Merge branch 'ce-jej/github-project-service-for-ci' into 'master'
Backport changes from introducing GithubService interation in EE
See merge request gitlab-org/gitlab-ce!17607
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/services/_form.html.haml | 3 | ||||
| -rw-r--r-- | app/views/shared/_service_settings.html.haml | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml index 17e804d682b..053ea24b848 100644 --- a/app/views/projects/services/_form.html.haml +++ b/app/views/projects/services/_form.html.haml @@ -5,6 +5,9 @@ = boolean_to_icon @service.activated? %p= @service.description + + - if @service.respond_to?(:detailed_description) + %p= @service.detailed_description .col-lg-9 = form_for(@service, as: :service, url: project_service_path(@project, @service.to_param), method: :put, html: { class: 'gl-show-field-errors form-horizontal integration-settings-form js-integration-settings-form', data: { 'can-test' => @service.can_test?, 'test-url' => test_project_service_path(@project, @service) } }) do |form| = render 'shared/service_settings', form: form, subject: @service diff --git a/app/views/shared/_service_settings.html.haml b/app/views/shared/_service_settings.html.haml index 61b39afb5d4..355b3ac75ae 100644 --- a/app/views/shared/_service_settings.html.haml +++ b/app/views/shared/_service_settings.html.haml @@ -13,12 +13,12 @@ .col-sm-10 = form.check_box :active, disabled: disable_fields_service?(@service) - - if @service.supported_events.present? + - if @service.configurable_events.present? .form-group = form.label :url, "Trigger", class: 'control-label' .col-sm-10 - - @service.supported_events.each do |event| + - @service.configurable_events.each do |event| %div = form.check_box service_event_field_name(event), class: 'pull-left' .prepend-left-20 |