Commit 720a2bbf authored by Phil Hughes's avatar Phil Hughes

Merge branch '5903-add-jenkins-ci-doc-link' into 'master'

Resolve "Add link to Jenkins integration page"

Closes #5903

See merge request gitlab-org/gitlab-ee!6066
parents 502c96e3 85f2f71c
%h3.page-title %h3.page-title
= @service.title = @service.title
%p #{@service.description} template %p #{@service.description} template.
= form_for :service, url: admin_application_settings_service_path, method: :put, html: { class: 'fieldset-form' } do |form| = form_for :service, url: admin_application_settings_service_path, method: :put, html: { class: 'fieldset-form' } do |form|
= render 'shared/service_settings', form: form, subject: @service = render 'shared/service_settings', form: form, subject: @service
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
= @service.title = @service.title
= boolean_to_icon @service.activated? = boolean_to_icon @service.activated?
%p= @service.description %p= #{@service.description}.
- if @service.respond_to?(:detailed_description) - if @service.respond_to?(:detailed_description)
%p= @service.detailed_description %p= @service.detailed_description
......
...@@ -65,7 +65,7 @@ class JenkinsService < CiService ...@@ -65,7 +65,7 @@ class JenkinsService < CiService
end end
def help def help
'You must have installed the Git Plugin and GitLab Plugin in Jenkins' "You must have installed the Git Plugin and GitLab Plugin in Jenkins. [More information](#{Gitlab::Routing.url_helpers.help_page_url('integration/jenkins')})"
end end
def self.to_param def self.to_param
......
---
title: Add link to Jenkins documentation within integration and service template
merge_request:
author:
type: added
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment