Updated template copy

Added copy to help the user understand where
templates are coming from and how to make their own.

ee/app/assets/javascripts/pages/admin/application_settings/ci_cd/ci_template.js

@@ -30,7 +30,7 @@ export default class CiTemplate {
     return {
       Reset: [
         {
-          name: 'No Required Pipeline',
+          name: 'No required pipeline',
           id: null,
         },
         'divider',

ee/app/views/admin/application_settings/_required_pipeline.html.haml

--# TODO: Change all references to `shared_runners_text` to be `required_template_name`
 - return unless License.feature_available?(:required_template_inclusion)
 
 %section.settings.as-required-pipeline.no-animate#js-required-pipeline-settings{ class: ('expanded' if expanded)}
@@ -8,16 +7,19 @@
     %button.btn.btn-default.js-settings-toggle{ type: 'button' }
       = expanded ? _('Collapse') : _('Expand')
     %p
-      - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('ci/yaml/README') }
-      = s_('AdminSettings|Set an instance-wide auto included %{link_start}pipeline configuration%{link_end}. This pipeline configuration will be run after the project\'s own configuration.').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
+      - config_link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('ci/yaml/README') }
+      = s_('AdminSettings|Set an instance-wide auto included %{link_start}pipeline configuration%{link_end}. This pipeline configuration will be run after the project\'s own configuration.').html_safe % { link_start: config_link_start, link_end: '</a>'.html_safe }
   .settings-content
+    %p
+      - instance_link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('user/admin_area/settings/instance_template_repository') }
+      = s_('AdminSettings|The required pipeline configuration can be selected from the %{code_start}gitlab-ci%{code_end} directory inside of the configured %{link_start}instance template repository%{link_end} or from GitLab provided configurations.').html_safe % { code_start: '<code>'.html_safe, code_end: '</code>'.html_safe, link_start: instance_link_start, link_end: '</a>'.html_safe }
     = form_for @application_setting, url: admin_application_settings_path(anchor: 'js-required-pipeline-settings'), html: { class: 'fieldset-form' } do |f|
       = form_errors(@application_setting)
 
       %fieldset
         .form-group
-          = f.label :required_template_name, s_('AdminSettings|Select a pipeline configuration file'), class: 'text-muted'
-          = dropdown_tag(s_('AdminSettings|No Required Pipeline'), options: { toggle_class: 'js-ci-template-dropdown w-100', title: s_('AdminSettings|Select a Template'), filter: true, placeholder: "Filter", data: { data: gitlab_ci_ymls(nil) } } )
-          = f.text_field :required_template_name, value: @application_setting.required_template_name, id: 'required_template_name', class: 'hidden'
+          = f.label :required_ci_template, s_('AdminSettings|Select a pipeline configuration file'), class: 'text-muted'
+          = dropdown_tag(s_('AdminSettings|No required pipeline'), options: { toggle_class: 'js-ci-template-dropdown dropdown-select', title: s_('AdminSettings|Select a template'), filter: true, placeholder: "Filter", data: { data: gitlab_ci_ymls(nil) } } )
+          = f.text_field :required_ci_template, value: @application_setting.required_ci_template, id: 'required_template_name', class: 'hidden'
 
       = f.submit _('Save changes'), class: "btn btn-success"

locale/gitlab.pot

@@ -853,16 +853,16 @@ msgstr ""
 msgid "AdminSettings|Environment variables are protected by default"
 msgstr ""
 
-msgid "AdminSettings|No Required Pipeline"
+msgid "AdminSettings|No required pipeline"
 msgstr ""
 
 msgid "AdminSettings|Required pipeline configuration"
 msgstr ""
 
-msgid "AdminSettings|Select a Template"
+msgid "AdminSettings|Select a pipeline configuration file"
 msgstr ""
 
-msgid "AdminSettings|Select a pipeline configuration file"
+msgid "AdminSettings|Select a template"
 msgstr ""
 
 msgid "AdminSettings|Set an instance-wide auto included %{link_start}pipeline configuration%{link_end}. This pipeline configuration will be run after the project's own configuration."
@@ -871,6 +871,9 @@ msgstr ""
 msgid "AdminSettings|Specify a domain to use by default for every project's Auto Review Apps and Auto Deploy stages."
 msgstr ""
 
+msgid "AdminSettings|The required pipeline configuration can be selected from the %{code_start}gitlab-ci%{code_end} directory inside of the configured %{link_start}instance template repository%{link_end} or from GitLab provided configurations."
+msgstr ""
+
 msgid "AdminSettings|When creating a new environment variable it will be protected by default."
 msgstr ""