Commit 965a36c1 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'fix-custom-templates-instance-settings-UI-text' into 'master'

Fix UI text for custom templates admin setting

See merge request gitlab-org/gitlab!65716
parents 873c37e9 85c2abfd
......@@ -9,36 +9,33 @@ type: reference
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/6860) in [GitLab Premium](https://about.gitlab.com/pricing/) 11.2.
GitLab administrators can configure the group where all the custom project
templates are sourced.
GitLab administrators can set a group to be the source of project templates that are
selectable when a new project is created on the instance. These templates can be selected
when you go to **New project > Create from template** and select the **Instance** tab.
Every project directly under the group namespace will be
available to the user if they have access to them. For example:
Every project in the group, but not its subgroups, can be selected when a new project
is created, based on the user's access permissions:
- Public projects, in the group will be available to every signed-in user, if all enabled [project features](../project/settings/index.md#sharing-and-permissions)
- Public projects can be selected by any signed-in user as a template for a new project,
if all enabled [project features](../project/settings/index.md#sharing-and-permissions)
except for GitLab Pages are set to **Everyone With Access**.
- Private projects will be available only if the user is a member of the project.
- Private projects can be selected only by users who are members of the projects.
Repository and database information that are copied over to each new project are
identical to the data exported with the
[GitLab Project Import/Export](../project/settings/import_export.md).
identical to the data exported with the [GitLab Project Import/Export](../project/settings/import_export.md).
NOTE:
To set project templates at a group level,
see [Custom group-level project templates](../group/custom_project_templates.md).
To set project templates at the group level, see [Custom group-level project templates](../group/custom_project_templates.md).
## Configuring
## Select instance-level project template group
GitLab administrators can configure a GitLab group that serves as template
source for an entire GitLab instance:
To select the group to use as the source for the project templates:
1. On the top bar, navigate to **Menu > Admin > Settings > Templates**.
1. Expand **Custom project templates**.
1. Select a group to use.
1. Select **Save changes**.
NOTE:
Projects below subgroups of the template group are **not** supported.
Projects in subgroups of the template group are **not** included in the template list.
<!-- ## Troubleshooting
......
......@@ -6,7 +6,7 @@
%button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded ? _('Collapse') : _('Expand')
%p
= _('Select a subgroup to use as a template when creating new projects in the group.')
= s_('AdminSettings|Select a group to use as the source for instance-level project templates.')
.settings-content
= form_for @application_setting, url: templates_admin_application_settings_path(anchor: 'js-custom-project-templates-settings') do |f|
......@@ -17,9 +17,9 @@
= f.label :file_template_project_id, class: 'label-bold' do
.form-text
= _('Search for a group')
= _('Select group')
= groups_select_tag('application_setting[custom_project_templates_group_id]', selected: @application_setting.custom_project_templates_group_id, class: 'input-clamp allowClear qa-custom-project-template-select', multiple: false)
- link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('user/group/custom_project_templates') }
= s_("GroupTemplate|The selected group's repositories and databases are copied into the projects created in this group. %{link_start}What should I add to my template group?%{link_end} ").html_safe % { link_start: link_start, link_end: "</a>".html_safe }
- link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('user/admin_area/custom_project_templates.md') }
= s_("AdminSettings|The projects in this group can be selected as templates for new projects created on the instance. %{link_start}Learn more.%{link_end} ").html_safe % { link_start: link_start, link_end: "</a>".html_safe }
= f.submit _('Save changes'), class: "gl-button btn btn-confirm qa-save-changes-button"
......@@ -2409,6 +2409,9 @@ msgstr ""
msgid "AdminSettings|Select a CI/CD template"
msgstr ""
msgid "AdminSettings|Select a group to use as the source for instance-level project templates."
msgstr ""
msgid "AdminSettings|Service template allows you to set default values for integrations"
msgstr ""
......@@ -2430,6 +2433,9 @@ msgstr ""
msgid "AdminSettings|The latest artifacts for all jobs in the most recent successful pipelines in each project are stored and do not expire."
msgstr ""
msgid "AdminSettings|The projects in this group can be selected as templates for new projects created on the instance. %{link_start}Learn more.%{link_end} "
msgstr ""
msgid "AdminSettings|The template for the required pipeline configuration can be one of the GitLab-provided templates, or a custom template added to an instance template repository. %{link_start}How do I create an instance template repository?%{link_end}"
msgstr ""
......@@ -15903,9 +15909,6 @@ msgstr ""
msgid "GroupSettings|remove the share with group lock from %{ancestor_group_name}"
msgstr ""
msgid "GroupTemplate|The selected group's repositories and databases are copied into the projects created in this group. %{link_start}What should I add to my template group?%{link_end} "
msgstr ""
msgid "Groups"
msgstr ""
......@@ -29347,9 +29350,6 @@ msgstr ""
msgid "Select a shared template repository for all projects on this instance."
msgstr ""
msgid "Select a subgroup to use as a template when creating new projects in the group."
msgstr ""
msgid "Select a template repository"
msgstr ""
......@@ -29386,6 +29386,9 @@ msgstr ""
msgid "Select file"
msgstr ""
msgid "Select group"
msgstr ""
msgid "Select group or project"
msgstr ""
......
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