diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-02-19 02:47:37 +0300 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-03-07 20:50:10 +0300 |
| commit | 6253d4456a98613b419d766a03af7ff9b9fcf2af (patch) | |
| tree | 6776fed77ca12bd4da5f8efec3301df124e08bd8 /app/views/projects/services | |
| parent | d9ca76559f740bdeac78bcd9a7cfe60df5ef9795 (diff) | |
Backport changes from EE's GithubService integration
Adds detailed_status to pipeline hook data
Adds detailed_description option for Services
Integration edit page renders 404 if a service is disabled
Diffstat (limited to 'app/views/projects/services')
| -rw-r--r-- | app/views/projects/services/_form.html.haml | 3 |
1 files changed, 3 insertions, 0 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 |